FXOLAT-388: remove cycle in class dependency

src/main/java/de/bps/olat/portal/institution/InstitutionPortlet.java

@@ -33,6 +33,8 @@ import org.olat.core.util.Util;
 import org.olat.core.util.WebappHelper;
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.naming.NoNameCoder;
+import com.thoughtworks.xstream.io.xml.XppDriver;
 
 
 public class InstitutionPortlet extends AbstractPortlet {
@@ -133,7 +135,7 @@ public class InstitutionPortlet extends AbstractPortlet {
 		institutions = new FastHashMap();
 		
 		File configurationFile = new File(WebappHelper.getContextRoot() + CONFIG_FILE);
-		XStream xstream = InstitutionPortletXStream.getXStream();
+		XStream xstream = getInstitutionConfigXStream();
 		InstitutionConfiguration configuration = (InstitutionConfiguration)xstream.fromXML(configurationFile);
 		
 		for(InstitutionPortletEntry institution: configuration.getInstitution()) {
@@ -156,6 +158,40 @@ public class InstitutionPortlet extends AbstractPortlet {
 	public static InstitutionPortletEntry getInstitutionPortletEntry(String institution) {
 		return (InstitutionPortletEntry) institutions.get(institution);
 	}
+		
+	public static XStream getInstitutionConfigXStream() {
+		XStream xstream = new XStream(new XppDriver(new NoNameCoder()));
+		xstream.alias("configuration", InstitutionConfiguration.class);
+		xstream.addImplicitCollection(InstitutionConfiguration.class, "institution", "institution", InstitutionPortletEntry.class);
+		xstream.alias("institution", InstitutionPortletEntry.class);
+		xstream.addImplicitCollection(InstitutionPortletEntry.class, "polymorphlink", "polymorphlink", PolymorphLink.class);
+		xstream.aliasAttribute(InstitutionPortletEntry.class, "shortname", "shortname");
+		xstream.alias("logo", Value.class);
+		xstream.alias("name", Value.class);
+		xstream.alias("url", Value.class);
+		
+		xstream.alias("supervisor", InstitutionPortletSupervisorEntry.class);
+		xstream.addImplicitCollection(InstitutionPortletEntry.class, "supervisor", "supervisor", InstitutionPortletSupervisorEntry.class);
+		xstream.alias("person", Value.class);
+		xstream.alias("phone", Value.class);
+		xstream.alias("email", Value.class);
+		xstream.alias("blog", Value.class);
+		//polymorph link
+		xstream.alias("polymorphlink", PolymorphLink.class);
+		xstream.aliasAttribute(PolymorphLink.class, "defaultId", "default_targetid");
+		xstream.aliasAttribute(PolymorphLink.class, "linkType", "type");
+		xstream.aliasAttribute(PolymorphLink.class, "linkText", "text");
+		//polymorph link element
+		xstream.alias("element", PolymorphLinkElement.class);
+		xstream.addImplicitCollection(PolymorphLink.class, "element", "element", PolymorphLinkElement.class);
+		xstream.aliasAttribute(PolymorphLinkElement.class, "attribute", "attribute");
+		xstream.aliasAttribute(PolymorphLinkElement.class, "value", "value");
+		xstream.aliasAttribute(PolymorphLinkElement.class, "cond", "condition");
+		xstream.aliasAttribute(PolymorphLinkElement.class, "id", "targetid");
+
+		xstream.aliasAttribute(Value.class, "value", "value");
+		return xstream;
+	}
 }
 
 /**

src/main/java/de/bps/olat/portal/institution/InstitutionPortletXStream.java

-package de.bps.olat.portal.institution;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.naming.NoNameCoder;
-import com.thoughtworks.xstream.io.xml.XppDriver;
-
-/**
- * 
- * Description:<br>
- * 
- * <P>
- * Initial Date:  2 déc. 2011 <br>
- *
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- */
-public class InstitutionPortletXStream {
-	
-	public static XStream getXStream() {
-		XStream xstream = new XStream(new XppDriver(new NoNameCoder()));
-		xstream.alias("configuration", InstitutionConfiguration.class);
-		xstream.addImplicitCollection(InstitutionConfiguration.class, "institution", "institution", InstitutionPortletEntry.class);
-		xstream.alias("institution", InstitutionPortletEntry.class);
-		xstream.addImplicitCollection(InstitutionPortletEntry.class, "polymorphlink", "polymorphlink", PolymorphLink.class);
-		xstream.aliasAttribute(InstitutionPortletEntry.class, "shortname", "shortname");
-		xstream.alias("logo", Value.class);
-		xstream.alias("name", Value.class);
-		xstream.alias("url", Value.class);
-		
-		xstream.alias("supervisor", InstitutionPortletSupervisorEntry.class);
-		xstream.addImplicitCollection(InstitutionPortletEntry.class, "supervisor", "supervisor", InstitutionPortletSupervisorEntry.class);
-		xstream.alias("person", Value.class);
-		xstream.alias("phone", Value.class);
-		xstream.alias("email", Value.class);
-		xstream.alias("blog", Value.class);
-		//polymorph link
-		xstream.alias("polymorphlink", PolymorphLink.class);
-		xstream.aliasAttribute(PolymorphLink.class, "defaultId", "default_targetid");
-		xstream.aliasAttribute(PolymorphLink.class, "linkType", "type");
-		xstream.aliasAttribute(PolymorphLink.class, "linkText", "text");
-		//polymorph link element
-		xstream.alias("element", PolymorphLinkElement.class);
-		xstream.addImplicitCollection(PolymorphLink.class, "element", "element", PolymorphLinkElement.class);
-		xstream.aliasAttribute(PolymorphLinkElement.class, "attribute", "attribute");
-		xstream.aliasAttribute(PolymorphLinkElement.class, "value", "value");
-		xstream.aliasAttribute(PolymorphLinkElement.class, "cond", "condition");
-		xstream.aliasAttribute(PolymorphLinkElement.class, "id", "targetid");
-
-		xstream.aliasAttribute(Value.class, "value", "value");
-		return xstream;
-	}
-
-}

src/test/java/de/bps/olat/portal/institution/InstitutionPortletTest.java

@@ -25,7 +25,7 @@ public class InstitutionPortletTest {
 
 	@Test
 	public void readConfiguration() throws IOException, URISyntaxException {
-		XStream xstream = InstitutionPortletXStream.getXStream();
+		XStream xstream = InstitutionPortlet.getInstitutionConfigXStream();
 		InputStream input = InstitutionPortletTest.class.getResourceAsStream("olat_portals_institution.xml");
 		InstitutionConfiguration obj = (InstitutionConfiguration)xstream.fromXML(input);