Author: julien(a)jboss.com Date: 2008-04-03 18:23:18 -0400 (Thu, 03 Apr 2008) New Revision: 10497 Added: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIObject.java Modified: modules/presentation/trunk/classic/pom.xml modules/presentation/trunk/classic/presentation-classic.iml modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java Log: added test case for type Modified: modules/presentation/trunk/classic/pom.xml =================================================================== --- modules/presentation/trunk/classic/pom.xml 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/classic/pom.xml 2008-04-03 22:23:18 UTC (rev 10497) @@ -13,12 +13,19 @@ <name>JBoss Portal Presentation Framework</name> <dependencies> + <dependency> - <groupId>sun-servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> + <groupId>org.jboss.portal.presentation</groupId> + <artifactId>presentation-presentation</artifactId> + <version>${project.version}</version> + </dependency> <dependency> + <groupId>sun-servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: modules/presentation/trunk/classic/presentation-classic.iml =================================================================== --- modules/presentation/trunk/classic/presentation-classic.iml 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/classic/presentation-classic.iml 2008-04-03 22:23:18 UTC (rev 10497) @@ -12,6 +12,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="presentation" exported="" /> <orderEntry type="module-library" exported=""> <library name="javax.servlet:servlet-api:2.4"> <CLASSES> @@ -39,6 +40,110 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="httpunit:httpunit:1.6"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="xerces:xmlParserAPIs:2.2.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="xerces:xercesImpl:2.6.2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="nekohtml:nekohtml:0.9.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="rhino:js:1.5R4.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jtidy:jtidy:4aug2000r7-dev"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="com.google.gwt:gwt-user:1.4.60"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/google/gwt/gwt-user/1.4.60/gwt-user-1.4.60.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/google/gwt/gwt-user/1.4.60/gwt-user-1.4.60-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/com/google/gwt/gwt-user/1.4.60/gwt-user-1.4.60-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="net.mygwt:mygwt:0.3.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/net/mygwt/mygwt/0.3.0/mygwt-0.3.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/net/mygwt/mygwt/0.3.0/mygwt-0.3.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/net/mygwt/mygwt/0.3.0/mygwt-0.3.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="org.jboss.portal.common:common-common:1.2.0.Beta3"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/common/common-common/1.2.0.Beta3/common-common-1.2.0.Beta3.jar!/" /> @@ -130,15 +235,15 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="commons-logging:commons-logging:1.0.3"> + <library name="commons-logging:commons-logging:1.1.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> @@ -221,6 +326,58 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.portlet:portlet-jsr168api:2.0.0.CR2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-jsr168api/2.0.0.CR2/portlet-jsr168api-2.0.0.CR2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-jsr168api/2.0.0.CR2/portlet-jsr168api-2.0.0.CR2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-jsr168api/2.0.0.CR2/portlet-jsr168api-2.0.0.CR2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.portlet:portlet-portal:2.0.0.CR2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portal/2.0.0.CR2/portlet-portal-2.0.0.CR2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portal/2.0.0.CR2/portlet-portal-2.0.0.CR2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portal/2.0.0.CR2/portlet-portal-2.0.0.CR2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.portlet:portlet-portlet:2.0.0.CR2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portlet/2.0.0.CR2/portlet-portlet-2.0.0.CR2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portlet/2.0.0.CR2/portlet-portlet-2.0.0.CR2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-portlet/2.0.0.CR2/portlet-portlet-2.0.0.CR2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="javax.portlet:portlet-api:2.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/portlet/portlet-api/2.0/portlet-api-2.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/portlet/portlet-api/2.0/portlet-api-2.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="org.jboss.portal.web:web-web:1.2.0.Beta3"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/web/web-web/1.2.0.Beta3/web-web-1.2.0.Beta3.jar!/" /> @@ -260,71 +417,84 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="org.jboss.microcontainer:jboss-container:2.0.0.Beta9"> + <library name="javax.servlet.jsp:jsp-api:2.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="org.jboss:javassist:3.6.0.GA"> + <library name="sun-jaxb:jaxb-api:2.1.4"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="org.jboss:jbossxb:2.0.0.CR4"> + <library name="javax.ccpp:ccpp:1.0"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/ccpp/ccpp/1.0/ccpp-1.0.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/ccpp/ccpp/1.0/ccpp-1.0-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/ccpp/ccpp/1.0/ccpp-1.0-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="apache-xerces:xercesImpl:2.7.1"> + <library name="org.jboss.portal.portlet:portlet-controller:2.0.0.CR2"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-controller/2.0.0.CR2/portlet-controller-2.0.0.CR2.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-controller/2.0.0.CR2/portlet-controller-2.0.0.CR2-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-controller/2.0.0.CR2/portlet-controller-2.0.0.CR2-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="wutka-dtdparser:dtdparser121:1.2.1"> + <library name="apache-xerces:resolver:2.7.1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/resolver/2.7.1/resolver-2.7.1.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/resolver/2.7.1/resolver-2.7.1-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/resolver/2.7.1/resolver-2.7.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="apache-xerces:xercesImpl:2.7.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="apache-xerces:xml-apis:2.7.1"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar!/" /> @@ -338,6 +508,45 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.portlet:portlet-mc:2.0.0.CR2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-mc/2.0.0.CR2/portlet-mc-2.0.0.CR2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-mc/2.0.0.CR2/portlet-mc-2.0.0.CR2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/portlet/portlet-mc/2.0.0.CR2/portlet-mc-2.0.0.CR2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jbossxb:2.0.0.CR4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-common-logging-spi:2.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="org.jboss:jboss-common-core:2.2.3.GA"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar!/" /> @@ -377,19 +586,84 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="jboss:jboss-logging-spi:2.0.3.GA"> + <library name="org.jboss.microcontainer:jboss-container:2.0.0.Beta9"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="org.jboss:javassist:3.6.0.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="wutka-dtdparser:dtdparser121:1.2.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:jboss-unit:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="concurrent:concurrent:1.3.4"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/concurrent/concurrent/1.3.4/concurrent-1.3.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.portal.common:common-mc:1.2.0.Beta3"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/common/common-mc/1.2.0.Beta3/common-mc-1.2.0.Beta3.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/common/common-mc/1.2.0.Beta3/common-mc-1.2.0.Beta3-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/portal/common/common-mc/1.2.0.Beta3/common-mc-1.2.0.Beta3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="org.jboss.microcontainer:jboss-kernel:2.0.0.Beta9"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar!/" /> @@ -416,41 +690,41 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="org.jboss.microcontainer:jboss-managed:2.0.0.Beta9"> + <library name="jboss:jboss-logging-spi:2.0.3.GA"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="org.jboss.aop:jboss-aop:2.0.0.CR1"> + <library name="org.jboss.microcontainer:jboss-managed:2.0.0.Beta9"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="jboss:jboss-common-logging-spi:2.0.4.GA"> + <library name="org.jboss.aop:jboss-aop:2.0.0.CR1"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar!/" /> </CLASSES> <JAVADOC> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-javadoc.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1-javadoc.jar!/" /> </JAVADOC> <SOURCES> - <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1-sources.jar!/" /> </SOURCES> </library> </orderEntry> @@ -546,6 +820,162 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:jboss-unit-remote:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-remote/1.2.0.Beta2/jboss-unit-remote-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-remote/1.2.0.Beta2/jboss-unit-remote-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-remote/1.2.0.Beta2/jboss-unit-remote-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:portal-test:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="cargo:core:0.9-portal"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/cargo/core/0.9-portal/core-0.9-portal.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/cargo/core/0.9-portal/core-0.9-portal-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/cargo/core/0.9-portal/core-0.9-portal-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="sun-opends:opends-core:legacy"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-opends/opends-core/legacy/opends-core-legacy.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-opends/opends-core/legacy/opends-core-legacy-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/sun-opends/opends-core/legacy/opends-core-legacy-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="hibernate:hibernate3:3.2.3.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="dom4j:dom4j:1.6.1"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="xml-apis:xml-apis:1.0.b2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-transaction:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jnpserver:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-jca:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss-local-jdbc:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-local-jdbc/4.0.4.GA/jboss-local-jdbc-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-local-jdbc/4.0.4.GA/jboss-local-jdbc-4.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss-local-jdbc/4.0.4.GA/jboss-local-jdbc-4.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss.jbossas.core-libs:jboss:4.0.4.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> <library name="jboss:jboss-common-core:2.0.3.GA"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-common-core/2.0.3.GA/jboss-common-core-2.0.3.GA.jar!/" /> @@ -571,6 +1001,370 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-system:4.2.0.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-system/4.2.0.GA/jboss-system-4.2.0.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-system/4.2.0.GA/jboss-system-4.2.0.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-system/4.2.0.GA/jboss-system-4.2.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:jboss-unit-mc:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:jboss-unit-tooling-ant:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.apache.ant:ant-junit:1.7.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.apache.ant:ant:1.7.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.apache.ant:ant-launcher:1.7.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:jboss-unit-tooling-core:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.unit:portal-test-generic:1.2.0.Beta2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test-generic/1.2.0.Beta2/portal-test-generic-1.2.0.Beta2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test-generic/1.2.0.Beta2/portal-test-generic-1.2.0.Beta2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/unit/portal-test-generic/1.2.0.Beta2/portal-test-generic-1.2.0.Beta2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-logging-jdk:2.0.3.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-jdk/2.0.3.GA/jboss-logging-jdk-2.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-jdk/2.0.3.GA/jboss-logging-jdk-2.0.3.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-jdk/2.0.3.GA/jboss-logging-jdk-2.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="jboss:jboss-logging-log4j:2.0.3.GA"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-log4j/2.0.3.GA/jboss-logging-log4j-2.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-log4j/2.0.3.GA/jboss-logging-log4j-2.0.3.GA-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/jboss/jboss-logging-log4j/2.0.3.GA/jboss-logging-log4j-2.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-aop-mc-int:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.Beta9/jboss-aop-mc-int-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.Beta9/jboss-aop-mc-int-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.Beta9/jboss-aop-mc-int-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-classloader:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-classloader/2.0.0.Beta9/jboss-classloader-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-classloader/2.0.0.Beta9/jboss-classloader-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-classloader/2.0.0.Beta9/jboss-classloader-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-classloading-spi:5.0.0.Beta3"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-client-spi:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta9/jboss-deployers-client-spi-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta9/jboss-deployers-client-spi-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta9/jboss-deployers-client-spi-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-core-spi:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-client:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client/2.0.0.Beta9/jboss-deployers-client-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client/2.0.0.Beta9/jboss-deployers-client-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-client/2.0.0.Beta9/jboss-deployers-client-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-core:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core/2.0.0.Beta9/jboss-deployers-core-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core/2.0.0.Beta9/jboss-deployers-core-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-core/2.0.0.Beta9/jboss-deployers-core-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-impl:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-impl/2.0.0.Beta9/jboss-deployers-impl-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-impl/2.0.0.Beta9/jboss-deployers-impl-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-impl/2.0.0.Beta9/jboss-deployers-impl-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-structure-spi:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-structure-spi/2.0.0.Beta9/jboss-deployers-structure-spi-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-structure-spi/2.0.0.Beta9/jboss-deployers-structure-spi-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-structure-spi/2.0.0.Beta9/jboss-deployers-structure-spi-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.osgi:osgi_R4_core:1.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-spi:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-spi/2.0.0.Beta9/jboss-deployers-spi-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-spi/2.0.0.Beta9/jboss-deployers-spi-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-spi/2.0.0.Beta9/jboss-deployers-spi-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-vfs-spi:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs-spi/2.0.0.Beta9/jboss-deployers-vfs-spi-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs-spi/2.0.0.Beta9/jboss-deployers-vfs-spi-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs-spi/2.0.0.Beta9/jboss-deployers-vfs-spi-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss:jboss-vfs:2.0.0.Beta6"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.Beta6/jboss-vfs-2.0.0.Beta6.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.Beta6/jboss-vfs-2.0.0.Beta6-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.Beta6/jboss-vfs-2.0.0.Beta6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="javax.xml.bind:jaxb-api:2.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="javax.xml.bind:jsr173_api:1.0"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="org.jboss.microcontainer:jboss-deployers-vfs:2.0.0.Beta9"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs/2.0.0.Beta9/jboss-deployers-vfs-2.0.0.Beta9.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs/2.0.0.Beta9/jboss-deployers-vfs-2.0.0.Beta9-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/org/jboss/microcontainer/jboss-deployers-vfs/2.0.0.Beta9/jboss-deployers-vfs-2.0.0.Beta9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="apache-taglibs:jstl:1.1.2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/jstl/1.1.2/jstl-1.1.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/jstl/1.1.2/jstl-1.1.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/jstl/1.1.2/jstl-1.1.2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="apache-taglibs:standard:1.1.2"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/standard/1.1.2/standard-1.1.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/standard/1.1.2/standard-1.1.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../.m2/repository/apache-taglibs/standard/1.1.2/standard-1.1.2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -1,80 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.impl.model2.ui; - -import org.jboss.portal.presentation.model2.ui.UIObject; -import org.jboss.portal.presentation.state.StateException; -import org.jboss.portal.presentation.state.structural.StructuralObject; -import org.jboss.portal.presentation.impl.model2.UIObjectRef; -import org.jboss.portal.common.reflect.Reflection; - -import java.util.Map; -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class UIObjectImpl implements UIObject -{ - - /** . */ - public StructuralObject structuralObject; - - /** We keep track of what was loaded by the scope. */ - public Map<String, UIObjectRef> childRefs; - - public UIObjectImpl(StructuralObject structuralObject) - { - this.structuralObject = structuralObject; - } - - public String getId() - { - return structuralObject.getId(); - } - - public String getName() - { - return structuralObject.getState().getName(); - } - - public <T> T getProperty(String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException - { - return Reflection.safeCast(getProperty(propertyName), propertyType); - } - - public Set<String> getPropertyNames() - { - return structuralObject.getState().getProperties().keySet(); - } - - public Object getProperty(String propertyName) throws IllegalArgumentException, StateException - { - if (propertyName == null) - { - throw new IllegalArgumentException(); - } - return structuralObject.getState().getProperties().get(propertyName); - } -} \ No newline at end of file Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIObject.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIObject.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model2/ui/UIObject.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -1,70 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.model2.ui; - -import org.jboss.portal.presentation.model.state.StateException; - -import java.util.Set; - -/** - * A wrapper of a structural object. The main goal of this object is to let the viewport add custom payload - * in addition of the structural state. - * - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface UIObject -{ - - /** - * Returns the id. - * - * @return the id - */ - String getId(); - - /** - * Returns the name. - * - * @return the name - */ - String getName(); - - /** - * Returns a property value or null if it does not exist. - * - * @param propertyName the property name - * @param propertyType the expected property type - * @return the property value - * @throws IllegalArgumentException if any argument is null or not valid - * @throws org.jboss.portal.presentation.model.state.StateException any state exception - */ - <T> T getProperty(String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException; - - /** - * Returns the set of property names of this object - * - * @return the property names - */ - Set<String> getPropertyNames(); -} Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockModelTestCase.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -22,10 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model; -import org.jboss.portal.presentation.model2.ui.UIContext; import org.jboss.portal.presentation.model2.ui.UIPage; import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIWindow; import org.jboss.portal.presentation.state.StaleStateException; import org.jboss.portal.presentation.state.structural.StructuralObject; import org.jboss.portal.presentation.state.structural.StructuralStateContext; @@ -102,7 +100,7 @@ protected Class<? extends UIObject> getType(MockObject object) { - return object.getType().getModelClass(); + return object.getType(); } protected String getId(MockObject object) @@ -121,27 +119,8 @@ } - protected MockObject addChild(MockObject object, String name, Class<? extends UIObject> modelType) + protected MockObject addChild(MockObject object, String name, Class<? extends UIObject> type) { - MockObject.Type type; - if (UIPage.class.equals(modelType)) - { - type = MockObject.Type.PAGE; - } - else if (UIContext.class.equals(modelType)) - { - type = MockObject.Type.CONTEXT; - } - else if (UIWindow.class.equals(modelType)) - { - type = MockObject.Type.WINDOW; - } - else - { - throw new AssertionError(); - } - - // return object.addChild(name, type); } Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockModelImpl.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -24,8 +24,6 @@ import org.jboss.portal.presentation.model2.ui.UIContext; import org.jboss.portal.presentation.model2.UIObject; -import org.jboss.portal.presentation.model2.ui.UIPage; -import org.jboss.portal.presentation.model2.ui.UIWindow; import org.jboss.portal.presentation.state.NoSuchStateException; import org.jboss.portal.presentation.state.StaleStateException; import org.jboss.portal.presentation.state.StateException; @@ -54,19 +52,8 @@ private final Map<String, MockObjectImpl> universe = new HashMap<String, MockObjectImpl>(); /** . */ - private final MockObjectImpl root = createObject(MockObject.Type.CONTEXT, ""); + private final MockObjectImpl root = createObject(UIContext.class, ""); - /** . */ - private static final Map<Class<? extends UIObject>, MockObject.Type> map; - - static - { - map = new HashMap<Class<? extends UIObject>, MockObject.Type>(); - map.put(UIContext.class, MockObject.Type.CONTEXT); - map.put(UIPage.class, MockObject.Type.PAGE); - map.put(UIWindow.class, MockObject.Type.WINDOW); - } - public StructuralStateContext getStructuralStateContext() { return structuralStateContext; @@ -99,7 +86,7 @@ ids.add(object.getId()); } - MockObjectImpl createObject(MockObject.Type type, String name) + MockObjectImpl createObject(Class<? extends UIObject> type, String name) { MockObjectImpl mockObject = new MockObjectImpl(this, name, type, "" + generator++); universe.put(mockObject.getId(), mockObject); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -39,28 +39,6 @@ public interface MockObject { - /** - * - */ - public enum Type - { - - PAGE(UIPage.class), WINDOW(UIWindow.class), CONTEXT(UIContext.class); - - /** . */ - final Class<? extends UIObject> clazz; - - Type(Class<? extends UIObject> clazz) - { - this.clazz = clazz; - } - - public Class<? extends UIObject> getModelClass() - { - return clazz; - } - } - public abstract static class UpdateBehavior { public static UpdateBehavior veto() @@ -98,7 +76,7 @@ } } - Type getType(); + Class<? extends UIObject> getType(); String getName(); @@ -116,9 +94,9 @@ Set<String> getPropertyNames(); - MockObject addChild(String name, Type type, Map<String, String> state) throws IllegalArgumentException, MockException; + MockObject addChild(String name, Class<? extends UIObject> type, Map<String, String> state) throws IllegalArgumentException, MockException; - MockObject addChild(String name, Type type) throws IllegalArgumentException, MockException; + MockObject addChild(String name, Class<? extends UIObject> type) throws IllegalArgumentException, MockException; MockObject getParent(); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.presentation.test.model.state.structural; +import org.jboss.portal.presentation.model2.UIObject; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -41,7 +43,7 @@ private static final Map<String, String> EMPTY_STATE = Collections.emptyMap(); /** . */ - private final MockObject.Type type; + private final Class<? extends UIObject> type; /** . */ private final String name; @@ -67,7 +69,7 @@ /** The version id. */ private StructuralObjectHandle handle; - MockObjectImpl(MockModelImpl model, String name, MockObject.Type type, String id) + MockObjectImpl(MockModelImpl model, String name, Class<? extends UIObject> type, String id) { this.model = model; this.name = name; @@ -79,7 +81,7 @@ this.handle = new StructuralObjectHandle(id, 0); } - public MockObject.Type getType() + public Class<? extends UIObject> getType() { return type; } @@ -142,7 +144,7 @@ return null; } - public MockObjectImpl addChild(String name, MockObject.Type type) throws MockException + public MockObjectImpl addChild(String name, Class<? extends UIObject> type) throws MockException { return addChild(name, type, EMPTY_STATE); } @@ -152,7 +154,7 @@ return Collections.unmodifiableSet(propertyValues.keySet()); } - public MockObjectImpl addChild(String name, Type type, Map<String, String> state) throws MockException + public MockObjectImpl addChild(String name, Class<? extends UIObject> type, Map<String, String> state) throws MockException { if (!valid) { @@ -254,7 +256,7 @@ } // - StructuralStateImpl state = new StructuralStateImpl(type.clazz, name, new HashMap<String, String>(propertyValues)); + StructuralStateImpl state = new StructuralStateImpl(type, name, new HashMap<String, String>(propertyValues)); // return new StructuralObjectImpl(handle, parentHandle, childrenHandles, state); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -25,6 +25,7 @@ import org.jboss.portal.presentation.model2.ViewPortScope; import org.jboss.portal.presentation.model2.ViewPort; import org.jboss.portal.presentation.model2.ObjectTraversalType; +import org.jboss.portal.presentation.model2.ui.UIPage; import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** @@ -59,7 +60,7 @@ context.assertConsistency(model.getRootId()); // - mockModel.getRoot().getChild("foo").addChild("juu", MockObject.Type.PAGE); + mockModel.getRoot().getChild("foo").addChild("juu", UIPage.class); fooDef.addChild("juu"); fooDef.setTraversal(after[0]); Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -25,6 +25,10 @@ import org.jboss.portal.presentation.model2.ViewPortScope; import org.jboss.portal.presentation.model2.ViewPort; import org.jboss.portal.presentation.model2.ObjectTraversalType; +import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.test.model.state.structural.MockObject; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -23,6 +23,9 @@ package org.jboss.portal.presentation.test.model3; import org.jboss.portal.presentation.model2.ObjectTraversalType; +import org.jboss.portal.presentation.model2.UIObject; +import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model2.ui.UIContext; import org.jboss.portal.presentation.test.model.state.structural.MockObject; import org.jboss.portal.presentation.test.model.state.structural.MockModel; @@ -42,7 +45,7 @@ public static NodeDef create() { - return new NodeDef(""); + return new NodeDef("", UIContext.class); } /** . */ @@ -58,11 +61,15 @@ private NodeDef parent; /** . */ + private final Class<? extends UIObject> type; + + /** . */ private final Map<String, String> properties; - private NodeDef(String name) + private NodeDef(String name, Class<? extends UIObject> type) { this.name = name; + this.type = type; this.children = new HashMap<String, NodeDef>(); this.traversal = ObjectTraversalType.RECURSIVE; this.parent = null; @@ -125,13 +132,18 @@ public NodeDef addChild(String name) { + return addChild(name, UIPage.class); + } + + public NodeDef addChild(String name, Class<? extends UIObject> type) + { if (children.containsKey(name)) { throw new IllegalStateException(); } // - NodeDef child = new NodeDef(name); + NodeDef child = new NodeDef(name, type); // children.put(name, child); @@ -164,7 +176,7 @@ { for (Map.Entry<String, NodeDef> childNodeEntry : children.entrySet()) { - MockObject child = object.addChild(childNodeEntry.getKey(), MockObject.Type.PAGE, properties); + MockObject child = object.addChild(childNodeEntry.getKey(), childNodeEntry.getValue().type, properties); childNodeEntry.getValue().populate(child); } } Added: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java (rev 0) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -0,0 +1,67 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.test.model3; + +import org.jboss.portal.presentation.model2.ui.UIPage; +import org.jboss.portal.presentation.model2.ui.UIWindow; +import org.jboss.portal.presentation.model2.ui.UIContext; +import org.jboss.portal.presentation.model2.ViewPortScope; +import org.jboss.portal.presentation.model2.ViewPort; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class TypeTestCase extends AbstractModelTestCase +{ + + public void testType() + { + NodeDef rootDef = NodeDef.create(); + NodeDef fooDef = rootDef.addChild("foo", UIPage.class); + NodeDef barDef = rootDef.addChild("bar", UIWindow.class); + + // + rootDef.populate(mockModel); + + // + ViewPortScope scope = new CustomScope(model, rootDef); + UIObjectTree context = new UIObjectTree(); + ViewPort viewPort = model.createViewPort(context, scope); + + // + viewPort.refresh(); + + // + UIObjectNode root = context.getNode(mockModel.getStructuralStateContext().getRootId()); + UIObjectNode foo = root.getChild("foo"); + UIObjectNode bar = root.getChild("bar"); + + // + assertTrue(root.getObject() instanceof UIContext); + assertTrue("was not expecting: " + foo.getObject().getClass().getName(), foo.getObject() instanceof UIPage); + assertTrue("was not expecting: " + bar.getObject().getClass().getName(), bar.getObject() instanceof UIWindow); + + } + +} Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java =================================================================== --- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-03 21:44:21 UTC (rev 10496) +++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-04-03 22:23:18 UTC (rev 10497) @@ -85,6 +85,11 @@ return children; } + public UIObjectNode getChild(String name) + { + return children.get(name); + } + public void addChild(UIObjectNode child) { if (children == null)