ate 2005/04/03 13:06:39 Modified: etc/project-dependencies use-fusion.xml fusion/src/webapp/WEB-INF/conf fusion.xreg webapp/WEB-INF/conf fusion.properties . maven.xml .classpath fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager FusionPAM.java fusion/src/webapp/WEB-INF/psml/user/admin/html default.psml webapp/WEB-INF/conf/assembly pluto-factories.xml jetspeed-spring.xml Removed: fusion/src/webapp/WEB-INF/templates/vm/portlets/html pa-form.vm pa-browser.vm fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager FusionAppServerPAM.java fusion/src/java/org/apache/jetspeed/fusion/modules/actions/portlets PortletApplicationViewBean.java AbstractPortletApplicationAction.java BrowsePortletApplicationAction.java RegisterPortletApplicationAction.java Log: Merged j2_refactoring_sync branch for Fusion now working against J2 2.0 M2 Revision Changes Path 1.19 +19 -19 jakarta-jetspeed/etc/project-dependencies/use-fusion.xml Index: use-fusion.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/etc/project-dependencies/use-fusion.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- use-fusion.xml 27 Dec 2004 22:13:30 -0000 1.18 +++ use-fusion.xml 3 Apr 2005 20:06:38 -0000 1.19 @@ -23,7 +23,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -32,7 +32,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-persistence</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -40,7 +40,7 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-capability</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -49,7 +49,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-cm</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -57,7 +57,7 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-portlet-factory</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -65,7 +65,7 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-page-manager</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle.jar>false</war.bundle.jar> <fusion.include>true</fusion.include> @@ -74,7 +74,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-commons</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> </properties> @@ -82,7 +82,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-components</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -91,7 +91,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-prefs</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -100,7 +100,7 @@ <dependency> <id>jetspeed-deploy-tools</id> <groupId>jetspeed2</groupId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -109,7 +109,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-rdbms</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -118,7 +118,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-registry</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -127,7 +127,7 @@ <dependency> <groupId>jetspeed2</groupId> <artifactId>jetspeed-security</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -135,7 +135,7 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-id-generator</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle.jar>false</war.bundle.jar> <fusion.include>true</fusion.include> @@ -143,7 +143,7 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-file-cache</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle.jar>false</war.bundle.jar> <fusion.include>true</fusion.include> @@ -151,14 +151,14 @@ </dependency> <dependency> <id>jetspeed2:jetspeed-api</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> </properties> </dependency> <dependency> <id>jetspeed2:jetspeed-locator</id> - <version>2.0-M1</version> + <version>2.0-M2</version> <properties> <war.bundle>false</war.bundle> <fusion.include>true</fusion.include> @@ -220,7 +220,7 @@ <dependency> <id>pluto</id> <groupId>pluto</groupId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1-rc2-PATCHED</version> <properties> <war.bundle>false</war.bundle> </properties> @@ -236,7 +236,7 @@ <dependency> <groupId>portals-bridges</groupId> <artifactId>portals-bridges-common</artifactId> - <version>0.1</version> + <version>0.2</version> <properties> <war.bundle>false</war.bundle> </properties> 1.4 +0 -24 jakarta-jetspeed/fusion/src/webapp/WEB-INF/conf/fusion.xreg Index: fusion.xreg =================================================================== RCS file: /home/cvs/jakarta-jetspeed/fusion/src/webapp/WEB-INF/conf/fusion.xreg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fusion.xreg 17 Aug 2004 06:00:12 -0000 1.3 +++ fusion.xreg 3 Apr 2005 20:06:38 -0000 1.4 @@ -26,29 +26,5 @@ <media-type ref="html"/> <media-type ref="wml"/> </portlet-entry> - <portlet-entry type="ref" parent="CustomizerVelocity" name="PABrowser"> - <security-ref parent="admin-only"/> - <parameter name="template" value="pa-browser" hidden="true"/> - <parameter name="action" value="portlets.BrowsePortletApplicationAction" hidden="true"/> - <meta-info> - <title>JSR-168 Apps</title> - <description>Browse JSR-168 Portlet Applications</description> - </meta-info> - <media-type ref="html"/> - <category>Portlet API</category> - <category>JSR168</category> - </portlet-entry> - <portlet-entry type="ref" parent="CustomizerVelocity" name="PAForm"> - <security-ref parent="admin-only"/> - <parameter name="template" value="pa-form" hidden="true"/> - <parameter name="action" value="portlets.RegisterPortletApplicationAction" hidden="true"/> - <meta-info> - <title>JSR-168 Portlet Applications</title> - <description>Register and Unregister JSR-168 Portlet Applications</description> - </meta-info> - <media-type ref="html"/> - <category>Portlet API</category> - <category>JSR168</category> - </portlet-entry> </registry> 1.13 +2 -2 jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties Index: fusion.properties =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fusion.properties 8 Nov 2004 18:15:40 -0000 1.12 +++ fusion.properties 3 Apr 2005 20:06:38 -0000 1.13 @@ -111,7 +111,7 @@ # THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH WHITESPACE) # BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT. # ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY org.apache.jetspeed.catalina.version.major -autodeployment.catalina.version.major=4 +autodeployment.catalina.version.major=5 autodeployment.catalina.base=${applicationRoot}/../../ autodeployment.catalina.engine=Catalina autodeployment.server=localhost 1.39 +0 -8 jakarta-jetspeed/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- maven.xml 16 Feb 2005 17:04:05 -0000 1.38 +++ maven.xml 3 Apr 2005 20:06:38 -0000 1.39 @@ -69,14 +69,6 @@ </fileset> </copy> <copy - todir="${maven.war.webapp.dir}/WEB-INF/templates/vm/portlets/html/" - overwrite="true"> - <fileset dir="fusion/src/webapp/WEB-INF/templates/vm/portlets/html/"> - <exclude name="CVS"/> - <include name="**.vm"/> - </fileset> - </copy> - <copy todir="${maven.war.webapp.dir}/WEB-INF/psml/user/admin/html/" overwrite="true"> <fileset dir="fusion/src/webapp/WEB-INF/psml/user/admin/html/"> 1.12 +62 -63 jakarta-jetspeed/.classpath Index: .classpath =================================================================== RCS file: /home/cvs/jakarta-jetspeed/.classpath,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .classpath 18 Jan 2005 17:08:45 -0000 1.11 +++ .classpath 3 Apr 2005 20:06:38 -0000 1.12 @@ -1,66 +1,65 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/CVS*" kind="src" path="src/java"/> - <classpathentry excluding="**/CVS*" kind="src" path="fusion/src/java"/> - <classpathentry excluding="**/CVS*" kind="src" path="src/test"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="MAVEN_REPO/castor/jars/castor-0.9.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.0-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/ecs/jars/ecs-1.4.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/fulcrum/jars/fulcrum-3.0-b2-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/turbine/jars/turbine-2.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/stratum/jars/stratum-1.0-b4-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/torque/jars/torque-3.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.4.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jcs/jars/jcs-1.0-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/soap/jars/soap-2.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/uddi4j/jars/uddi4j-1.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.3.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/village/jars/village-2.0-dev-20030625.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.5.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-13-1.4.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-ant-1.4.1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.3.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/ojb/jars/ojb-0.7.343.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-api-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/pluto/jars/pluto-1.0.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-cm-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-capability-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-cps-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-file-cache-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-id-generator-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-locator-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-page-manager-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-persistence-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-prefs-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-registry-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-security-2.0-a1-dev.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/activemq/jars/activemq-1.0.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-j2ee-management-1.0-M1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-jms-1.0-M1.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-portlet-factory-2.0-a1-dev.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry excluding="**/CVS*" kind="src" path="src/java"/> + <classpathentry excluding="**/CVS*" kind="src" path="fusion/src/java"/> + <classpathentry excluding="**/CVS*" kind="src" path="src/test"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="MAVEN_REPO/castor/jars/castor-0.9.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-configuration/jars/commons-configuration-1.0-dev.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/ecs/jars/ecs-1.4.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/fulcrum/jars/fulcrum-3.0-b2-dev.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/turbine/jars/turbine-2.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/stratum/jars/stratum-1.0-b4-dev.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/torque/jars/torque-3.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.4.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jcs/jars/jcs-1.0-dev.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/soap/jars/soap-2.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/uddi4j/jars/uddi4j-1.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/village/jars/village-2.0-dev-20030625.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.5.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-13-1.4.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/cactus/jars/cactus-ant-1.4.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.3.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/ojb/jars/ojb-0.7.343.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-api-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/pluto/jars/pluto-1.0.1-rc2-PATCHED.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-cm-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-capability-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-file-cache-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-id-generator-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-locator-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-page-manager-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-persistence-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-prefs-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-rdbms-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-registry-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-security-2.0-M2.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/activemq/jars/activemq-1.0.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-j2ee-management-1.0-M1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-jms-1.0-M1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-portlet-factory-2.0-M2.jar"/> + <classpathentry kind="output" path="bin"/> </classpath> 1.16 +47 -148 jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java Index: FusionPAM.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- FusionPAM.java 8 Nov 2004 05:20:44 -0000 1.15 +++ FusionPAM.java 3 Apr 2005 20:06:38 -0000 1.16 @@ -19,16 +19,14 @@ import java.util.Enumeration; import java.util.Iterator; -import javax.servlet.ServletContext; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jetspeed.Jetspeed; -import org.apache.jetspeed.cache.PortletCache; import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent; import org.apache.jetspeed.components.portletregistry.PortletRegistry; +import org.apache.jetspeed.components.portletregistry.RegistryException; import org.apache.jetspeed.container.window.PortletWindowAccessor; -import org.apache.jetspeed.exception.RegistryException; +import org.apache.jetspeed.factory.PortletFactory; import org.apache.jetspeed.om.common.portlet.MutablePortletApplication; import org.apache.jetspeed.om.profile.Entry; import org.apache.jetspeed.om.profile.PSMLDocument; @@ -42,13 +40,7 @@ import org.apache.jetspeed.services.PsmlManager; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.resources.FusionResources; -import org.apache.jetspeed.tools.pamanager.Deployment; -import org.apache.jetspeed.tools.pamanager.DeploymentRegistration; -import org.apache.jetspeed.tools.pamanager.FileSystemPAM; -import org.apache.jetspeed.tools.pamanager.PortletApplicationException; -import org.apache.jetspeed.tools.pamanager.Registration; -import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager; -import org.apache.jetspeed.util.FileSystemHelper; +import org.apache.jetspeed.tools.pamanager.PortletApplicationManager; import org.apache.jetspeed.util.descriptor.PortletApplicationWar; import org.apache.pluto.om.common.Description; import org.apache.pluto.om.common.DisplayName; @@ -57,24 +49,15 @@ import org.apache.pluto.om.portlet.PortletDefinition; import org.apache.turbine.util.TurbineConfig; -//import org.apache.regexp.RE; -//import org.apache.regexp.RECompiler; - - /** * FusionPAM * * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford</a> * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor </a> + * @author <a href="mailto:[EMAIL PROTECTED]">Ate Douma</a> * @version $Id$ */ -public class FusionPAM - extends - FileSystemPAM - implements - Deployment, - Registration, - DeploymentRegistration +public class FusionPAM extends PortletApplicationManager { private static final Log log = LogFactory.getLog("deployment"); @@ -85,14 +68,10 @@ private static final String JS1_REFERENCE_TYPE = "ref"; - public FusionPAM(String webAppsDir, - PortletRegistry registry, - PortletEntityAccessComponent entityAccess, - PortletWindowAccessor windowAccess, - PortletCache portletCache, - ApplicationServerManager appServerManager) + public FusionPAM(PortletFactory portletFactory, PortletRegistry registry, + PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess) { - super(webAppsDir, registry, entityAccess, windowAccess, portletCache, appServerManager); + super(portletFactory, registry, entityAccess, windowAccess); initJetspeedOne(null); } @@ -166,18 +145,11 @@ */ } - public void deploy(PortletApplicationWar paWar) - throws PortletApplicationException + protected MutablePortletApplication registerPortletApplication(PortletApplicationWar paWar, + MutablePortletApplication oldPA, boolean local) + throws RegistryException { - // System.out.println("***** Deploying now...." + paWar.); - super.deploy(paWar); - - fusionDeploy(paWar.getPortletApplicationName()); - } - - private void fusionDeploy(String paName) - throws PortletApplicationException - { + MutablePortletApplication app = super.registerPortletApplication(paWar, oldPA, local); //create xreg try { @@ -185,14 +157,12 @@ // registry.processPortletApplicationTree(app, "remove"); log.info("Saving the portlet.xml in the J1 registry..."); - MutablePortletApplication app = registry.getPortletApplication(paName); - Collection pds = app.getPortletDefinitions(); Iterator pdsIter = pds.iterator(); while (pdsIter.hasNext()) { PortletDefinition pdef = (PortletDefinition) pdsIter.next(); - PortletEntry entry = createPortletEntry(paName, pdef); + PortletEntry entry = createPortletEntry(app.getName(), pdef); Registry.saveEntry(Registry.PORTLET, entry); System.out.println("Writing registry: " + entry.getName()); @@ -205,8 +175,39 @@ // store.getTransaction().rollback(); log.error("Error processing rollback. Attempting to rollback registry transaction.", e1); } - //TurbineServices.getInstance().shutdownServices(); - + return app; + } + + protected void unregisterPortletApplication(MutablePortletApplication pa, boolean purgeEntityInfo) + throws RegistryException + { + try + { + // remove entries from the registry + + Collection pds = pa.getPortletDefinitions(); + Iterator pdsIter = pds.iterator(); + while (pdsIter.hasNext()) + { + PortletDefinition pdef = (PortletDefinition) pdsIter.next(); + String name = pdef.getName(); + Registry.removeEntry(Registry.PORTLET, name); + + // remove PSML refs + if (purgeEntityInfo) + { + removePSML(name); + } + } + + } + catch (Exception e1) + { + e1.printStackTrace(); + // store.getTransaction().rollback(); + log.error("Error processing rollback. Attempting to rollback registry transaction.", e1); + } + super.unregisterPortletApplication(pa, purgeEntityInfo); } public static PortletEntry createPortletEntry(String paName, PortletDefinition portletDefinition) @@ -341,15 +342,6 @@ return entry; } - public void undeploy( PortletApplicationWar paWar ) throws PortletApplicationException - { - String paName = paWar.getPortletApplicationName(); - - fusionUndeploy(paName, true); - super.undeploy(paWar); - - } - /** * Removes all PSML entries in the entire portal for the given name * @@ -384,97 +376,4 @@ log.error("Remove PSML: Failed to remove profiles for portlet: " + name, e ); } } - - public boolean registerPortletApplication(FileSystemHelper fileSystem, - String portletApplicationName) - throws RegistryException - { - boolean existed = (registry.getPortletApplication(portletApplicationName) != null); - boolean registered = super.registerPortletApplication(fileSystem, portletApplicationName); - if (registered) - { - if (existed) - { - fusionUndeploy(portletApplicationName, false); - } - try - { - fusionDeploy(portletApplicationName); - } - catch (Exception e) - { - throw new RegistryException(e); - } - } - return registered; - } - - public boolean registerPortletApplication( - String portletApplicationName, - String contextName, - ServletContext context) - throws RegistryException - { - boolean existed = (registry.getPortletApplication(portletApplicationName) != null); - boolean registered = super.registerPortletApplication(portletApplicationName, contextName, context); - if (registered) - { - if (existed) - { - fusionUndeploy(portletApplicationName, false); - } - try - { - fusionDeploy(portletApplicationName); - } - catch (Exception e) - { - throw new RegistryException(e); - } - } - return registered; - } - - private void fusionUndeploy(String paName, boolean zapPSML) - { - PortletRegistry registry = (PortletRegistry) Jetspeed.getComponentManager().getComponent(PortletRegistry.class); - - try - { - // remove entries from the registry - - MutablePortletApplication app = registry.getPortletApplication(paName); - - Collection pds = app.getPortletDefinitions(); - Iterator pdsIter = pds.iterator(); - while (pdsIter.hasNext()) - { - PortletDefinition pdef = (PortletDefinition) pdsIter.next(); - String name = pdef.getName(); - Registry.removeEntry(Registry.PORTLET, name); - - // remove PSML refs - if (zapPSML) - { - removePSML(name); - } - } - - } - catch (Exception e1) - { - e1.printStackTrace(); - // store.getTransaction().rollback(); - log.error("Error processing rollback. Attempting to rollback registry transaction.", e1); - } - //TurbineServices.getInstance().shutdownServices(); - - } - - public void unregister( String paName ) - throws PortletApplicationException - { - fusionUndeploy(paName, false); - super.unregister(paName); - } } 1.3 +0 -4 jakarta-jetspeed/fusion/src/webapp/WEB-INF/psml/user/admin/html/default.psml Index: default.psml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/fusion/src/webapp/WEB-INF/psml/user/admin/html/default.psml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- default.psml 2 Aug 2004 21:02:23 -0000 1.2 +++ default.psml 3 Apr 2005 20:06:39 -0000 1.3 @@ -44,7 +44,6 @@ <entry id='325' parent="PermissionBrowser"/> <entry id='326' parent="GroupBrowser"/> <entry id="345" parent="SecurityBrowser"/> - <entry id="399" parent="PABrowser"/> <entry id='327' parent="UserForm"> <parameter name="_menustate" value="closed"/> </entry> @@ -72,9 +71,6 @@ <entry id="350" parent="SecurityForm"> <parameter name="_menustate" value="closed"/> </entry> - <entry id="398" parent="PAForm"> - <parameter name="_menustate" value="closed"/> - </entry> </portlets> <portlets id='303'> 1.4 +51 -0 jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pluto-factories.xml Index: pluto-factories.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pluto-factories.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pluto-factories.xml 12 Aug 2004 18:42:01 -0000 1.3 +++ pluto-factories.xml 3 Apr 2005 20:06:39 -0000 1.4 @@ -2,6 +2,44 @@ <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> + <bean id="LocalPortletInvokerTarget" + class="org.apache.jetspeed.container.invoker.LocalPortletInvoker" singleton="false" + /> + + <bean id="LocalPortletInvokerTargetSource" + class="org.springframework.aop.target.CommonsPoolTargetSource"> + <property name="targetBeanName"><value>LocalPortletInvokerTarget</value></property> + <property name="maxSize"><value>25</value></property> + </bean> + + <bean id="LocalPortletInvoker" + class="org.springframework.aop.framework.ProxyFactoryBean" + > + <property name="targetSource"><ref local="LocalPortletInvokerTargetSource"/></property> + <property name="proxyInterfaces"> + <value>org.apache.jetspeed.container.invoker.JetspeedPortletInvoker</value> + </property> + </bean> + + <bean id="ServletPortletInvokerTarget" + class="org.apache.jetspeed.container.invoker.ServletPortletInvoker" singleton="false" + /> + + <bean id="ServletPortletInvokerTargetSource" + class="org.springframework.aop.target.CommonsPoolTargetSource"> + <property name="targetBeanName"><value>ServletPortletInvokerTarget</value></property> + <property name="maxSize"><value>25</value></property> + </bean> + + <bean id="ServletPortletInvoker" + class="org.springframework.aop.framework.ProxyFactoryBean" + > + <property name="targetSource"><ref local="ServletPortletInvokerTargetSource"/></property> + <property name="proxyInterfaces"> + <value>org.apache.jetspeed.container.invoker.JetspeedPortletInvoker</value> + </property> + </bean> + <bean id="javax.portlet.ActionRequest" class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean" > @@ -94,6 +132,19 @@ > <property name="className"><value>org.apache.jetspeed.container.invoker.PortletInvokerFactoryImpl</value></property> <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property> + <property name="props"> + <map> + <entry key="PortletFactory"> + <ref bean="portletFactory" /> + </entry> + <entry key="LocalPortletInvoker"> + <ref bean="LocalPortletInvoker" /> + </entry> + <entry key="ServletPortletInvoker"> + <ref bean="ServletPortletInvoker" /> + </entry> + </map> + </property> </bean> <bean id="org.apache.pluto.util.NamespaceMapper" 1.9 +31 -40 jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml Index: jetspeed-spring.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jetspeed-spring.xml 8 Nov 2004 05:21:52 -0000 1.8 +++ jetspeed-spring.xml 3 Apr 2005 20:06:39 -0000 1.9 @@ -30,8 +30,7 @@ <bean id="javax.servlet.ServletConfig" class="org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean" /> - - + <!-- Portlet Services --> <bean id="PortalServices" class="org.apache.jetspeed.services.JetspeedPortletServices" > @@ -43,6 +42,16 @@ <entry key="PAM"> <ref bean="PAM" /> </entry> + <!-- ApplicationServerManager currently only supported for Tomcat. Comment out for others like JBoss --> + <entry key="ApplicationServerManager"> + <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/> + </entry> + <entry key="PortletFactory"> + <ref bean="portletFactory"/> + </entry> + <entry key="DeploymentManager"> + <ref bean="deploymentManager"/> + </entry> </map> </constructor-arg> </bean> @@ -285,26 +294,10 @@ <constructor-arg ><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" /></constructor-arg> </bean> - <!-- Portlet Cache --> - <bean id="portletCache" - class="org.apache.jetspeed.cache.PortletCache" - > - - </bean> - <!-- Portlet Factory --> <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory" > - <constructor-arg ><ref bean="portletCache" /></constructor-arg> - </bean> - - <!-- Portlet Factory Proxy Accessor--> - <bean id="portletFactoryProxy" - class="org.apache.jetspeed.factory.JetspeedPortletFactoryProxy" - destroy-method="reset" - > - <constructor-arg ><ref bean="portletFactory" /></constructor-arg> </bean> <!-- Aggregation: Page --> @@ -333,9 +326,9 @@ <constructor-arg ><ref bean="org.apache.jetspeed.aggregator.PortletRenderer" /></constructor-arg> </bean> - <!-- Application Server Manager + <!-- Application Server Manager for Tomcat. Comment out for others like JBoss Provides hooks into the application server to help us deploy portlet applications - as web application into that server. + as web application into that server. This manager is for Tomcat 5 --> <bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager" class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager" @@ -343,38 +336,36 @@ > <constructor-arg index="0"><value>${autodeployment.catalina.base}</value></constructor-arg> <constructor-arg index="1"><value>${autodeployment.catalina.engine}</value></constructor-arg> - <constructor-arg index="2"><value>${autodeployment.catalina.version.major}</value></constructor-arg> - <constructor-arg index="3"><value>${autodeployment.server}</value></constructor-arg> - <constructor-arg index="4"><value>${autodeployment.port}</value></constructor-arg> - <constructor-arg index="5"><value>${autodeployment.user}</value></constructor-arg> - <constructor-arg index="6"><value>${autodeployment.password}</value></constructor-arg> + <constructor-arg index="2"><value>${autodeployment.server}</value></constructor-arg> + <constructor-arg index="3"><value>${autodeployment.port}</value></constructor-arg> + <constructor-arg index="4"><value>${autodeployment.user}</value></constructor-arg> + <constructor-arg index="5"><value>${autodeployment.password}</value></constructor-arg> </bean> + <bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/> + <!-- Portlet Application Manager - Deploys portlet application to both Jetspeed's portlet registry - and to application server Jetspeed is using to process the web application - portion of the portlet application. + Manages portlet application to Jetspeed's portlet registry --> <bean id="PAM" - class="org.apache.jetspeed.fusion.tools.pamanager.FusionAppServerPAM" - init-method="start" destroy-method="stop" + class="org.apache.jetspeed.fusion.tools.pamanager.FusionPAM" > - <constructor-arg ><value>${autodeployment.target.dir}</value></constructor-arg> - <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" /></constructor-arg> - <constructor-arg ><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" /></constructor-arg> - <constructor-arg ><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" /></constructor-arg> - <constructor-arg ><ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager" /></constructor-arg> - <constructor-arg ><ref bean="portletCache" /></constructor-arg> + <constructor-arg><ref bean="portletFactory"/></constructor-arg> + <constructor-arg><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg> + <constructor-arg><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/></constructor-arg> + <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg> </bean> <!-- Portlet Application deployment event listener --> <bean id="portletAppDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener" > - <constructor-arg ><value>${autodeployment.staging.dir}</value></constructor-arg> - <constructor-arg ><ref bean="PAM" /></constructor-arg> - <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" /></constructor-arg> - <constructor-arg><ref bean="portletFactory"/></constructor-arg> + <constructor-arg index="0"><ref bean="PAM"/></constructor-arg> + <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg> + <constructor-arg index="2"><value>${autodeployment.target.dir}</value></constructor-arg> + <constructor-arg index="3"><value>${applicationRoot}/WEB-INF/apps</value></constructor-arg> + <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to true --> + <constructor-arg index="4"><value>false</value></constructor-arg> </bean> <!-- The deployment manager watches a specific staging directory for
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]