ate 2004/07/29 15:27:51
Modified: . project.properties maven.xml .classpath
portal maven.xml
maven-plugin plugin.jelly
Log:
Update to the new Portals Struts Bridge
Revision Changes Path
1.23 +1 -1 jakarta-jetspeed-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.properties 24 Jul 2004 21:58:59 -0000 1.22
+++ project.properties 29 Jul 2004 22:27:51 -0000 1.23
@@ -44,7 +44,7 @@
# ---------------------------------------------------------------------------
# Multiproject settings
-maven.multiproject.includes=*/project.xml,components/*/project.xml,applications/*/project.xml,struts-portlet/*/project.xml,taglibs/*/project.xml
+maven.multiproject.includes=*/project.xml,components/*/project.xml,applications/*/project.xml,portals-bridges/*/project.xml,taglibs/*/project.xml
maven.multiproject.excludes=project.xml,applications/project.xml,cornerstone*/project.xml,portlet-api/project.xml,design-docs/project.xml,site/project.xml,taglibs/project.xml,maven-plugin/project.xml
maven.multiproject.site.goals=site,dashboard:report-single
1.86 +7 -7 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- maven.xml 23 Jul 2004 23:42:24 -0000 1.85
+++ maven.xml 29 Jul 2004 22:27:51 -0000 1.86
@@ -95,7 +95,7 @@
<maven:reactor
basedir="${basedir}"
-
includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml,struts-portlet/*/project.xml"
+
includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml,portals-bridges/*/project.xml"
excludes="applications/project.xml,cornerstone-demo/project.xml,taglibs/project.xml"
goals="clean"
banner="Cleaning"
@@ -136,17 +136,17 @@
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
- basedir="${basedir}/struts-portlet/spi"
+ basedir="${basedir}/portals-bridges/common"
includes="project.xml"
goals="jar:install"
- banner="Build and Install the Struts Portlet SPI jar"
+ banner="Build and Install the Portals Bridges common jar"
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
- basedir="${basedir}/struts-portlet/framework"
+ basedir="${basedir}/portals-bridges/struts"
includes="project.xml"
goals="jar:install"
- banner="Build and Install the Struts Portlet jar"
+ banner="Build and Install the Portals Bridges Struts jar"
postProcessing="false"
ignoreFailures="false"/>
<maven:reactor
@@ -282,10 +282,10 @@
ignoreFailures="false"/>
<maven:reactor
- basedir="${basedir}/struts-portlet/demo"
+ basedir="${basedir}/applications/struts-demo"
includes="project.xml"
goals="war:install"
- banner="Build and Install the Demo application WAR"
+ banner="Build and Install the Struts Demo application WAR"
postProcessing="false"
ignoreFailures="false"/>
1.57 +3 -3 jakarta-jetspeed-2/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .classpath 24 Jul 2004 22:11:57 -0000 1.56
+++ .classpath 29 Jul 2004 22:27:51 -0000 1.57
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/CVS/*" kind="src"
path="applications/perl/src/java"/>
- <classpathentry excluding="**/CVS/*" kind="src"
path="struts-portlet/demo/src/java"/>
+ <classpathentry excluding="**/CVS/*" kind="src"
path="applications/struts-demo/src/java"/>
<classpathentry excluding="**/CVS/*" kind="src"
path="applications/php/src/java"/>
<classpathentry excluding="**/CVS/*" kind="src" path="commons/src/java"/>
<classpathentry kind="src" path="components/deploy-tool/src/java"/>
@@ -19,8 +19,6 @@
<classpathentry excluding="**/CVS/*|log4j.properties" kind="src"
path="components/file-cache/src/test"/>
<classpathentry kind="src" path="components/id-generator/src/java"/>
<classpathentry excluding="**/CVS/*|log4j.properties" kind="src"
path="components/id-generator/src/test"/>
- <classpathentry excluding="**/CVS/*" kind="src"
path="struts-portlet/framework/src/java"/>
- <classpathentry excluding="**/CVS/*" kind="src"
path="struts-portlet/spi/src/java"/>
<classpathentry kind="src" path="src/java"/>
<classpathentry excluding="**/CVS/*" kind="src" path="portlet-api/src/java"/>
<classpathentry excluding="**/CVS/*" kind="src"
path="applications/demo/src/java"/>
@@ -93,5 +91,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/spring/jars/spring-core-1.0.2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-2.0.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/itgroundwork/jars/phpportlet.jar"/>
+ <classpathentry excluding="**/CVS/*" kind="src"
path="portals-bridges/common/src/java"/>
+ <classpathentry excluding="**/CVS/*" kind="src"
path="portals-bridges/struts/src/java"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.92 +5 -5 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- maven.xml 22 Jul 2004 15:01:08 -0000 1.91
+++ maven.xml 29 Jul 2004 22:27:51 -0000 1.92
@@ -286,11 +286,11 @@
<goal name="pam.strutsdeploy">
<!--
<j:set var="pam.app.name" value="struts-demo"/>
- <j:set var="pam.app.war"
value="../struts-portlet/demo/target/struts-demo.war"/>
+ <j:set var="pam.app.war"
value="../applications/struts-demo/target/struts-demo.war"/>
<attainGoal name="pam.template.deploy"/>
-->
- <j:set var="maven.build.dir" value="../struts-portlet/demo/target" />
+ <j:set var="maven.build.dir" value="../applications/struts-demo/target" />
<j:set var="maven.war.final.name" value="struts-demo.war" />
<attainGoal name="jetspeed2:deploy" />
</goal>
@@ -350,8 +350,8 @@
</goal>
<goal name="pam.strutsundeploy">
- <j:set var="pam.app.name" value="testsuite"/>
- <j:set var="pam.app.type" value="struts-demo"/>
+ <j:set var="pam.app.name" value="struts-demo"/>
+ <j:set var="pam.app.type" value="webapp"/>
<attainGoal name="pam.template.undeploy"/>
</goal>
@@ -459,7 +459,7 @@
<copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar"
todir="${org.apache.jetspeed.server.shared}"/>
<copy
file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar"
todir="${org.apache.jetspeed.server.shared}"/>
<copy file="${maven.repo.local}/log4j/jars/log4j-1.2.8.jar"
todir="${org.apache.jetspeed.server.shared}"/>
- <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
+ <copy
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
</goal>
<goal name="catalina:shared"
1.11 +2 -2 jakarta-jetspeed-2/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 28 Jul 2004 13:29:06 -0000 1.10
+++ plugin.jelly 29 Jul 2004 22:27:51 -0000 1.11
@@ -201,11 +201,11 @@
<copy file="${portal_project.getDependencyPath('commons-logging')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
<copy file="${portal_project.getDependencyPath('commons-configuration')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
<copy file="${portal_project.getDependencyPath('log4j')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
- <!-- <copy file="${portal_project.getDependencyPath('struts-portlet')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
-->
- <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
<copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true" />
<copy file="${portal_project.getDependencyPath('portlet-api')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
<copy file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}"
todir="${org.apache.jetspeed.server.shared}" failonerror="true" overwrite="true"/>
+ <copy
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
+ <copy
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
</goal>
<goal name="jetspeed2:deploy.portal">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
