You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2004/10/17 06:54:41 UTC
svn commit: rev 54950 - in portals/pluto/branches/pluto-1.1: . binding container deploy portal portal/src/webapp/WEB-INF testsuite xdocs
Author: ddewolf
Date: Sat Oct 16 21:54:38 2004
New Revision: 54950
Added:
portals/pluto/branches/pluto-1.1/testsuite/build.properties.sample
Modified:
portals/pluto/branches/pluto-1.1/binding/project.xml
portals/pluto/branches/pluto-1.1/container/project.xml
portals/pluto/branches/pluto-1.1/deploy/project.xml
portals/pluto/branches/pluto-1.1/maven.xml
portals/pluto/branches/pluto-1.1/portal/project.xml
portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml
portals/pluto/branches/pluto-1.1/project.xml
portals/pluto/branches/pluto-1.1/testsuite/maven.xml
portals/pluto/branches/pluto-1.1/testsuite/project.properties
portals/pluto/branches/pluto-1.1/testsuite/project.xml
portals/pluto/branches/pluto-1.1/xdocs/todo.xml
Log:
Cleaning up the build.
Modified: portals/pluto/branches/pluto-1.1/binding/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/binding/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/binding/project.xml Sat Oct 16 21:54:38 2004
@@ -39,42 +39,4 @@
<version>1.6</version>
</dependency>
</dependencies>
-
- <build>
- <nagEmailAddress>pluto-dev@jakarta.apache.org</nagEmailAddress>
-
- <sourceDirectory>src/java</sourceDirectory>
- <aspectSourceDirectory/>
-
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
- <integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
-
- <integrationUnitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </integrationUnitTest>
-
-
- <resources>
- <resource>
- <directory>src/conf</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <jars/>
-
- </build>
-
</project>
Modified: portals/pluto/branches/pluto-1.1/container/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/container/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/container/project.xml Sat Oct 16 21:54:38 2004
@@ -66,7 +66,7 @@
<dependency>
<groupId>pluto</groupId>
<artifactId>pluto-binding</artifactId>
- <version>1.1</version>
+ <version>1.1-ALPHA</version>
</dependency>
<dependency>
@@ -75,43 +75,5 @@
</dependency>
</dependencies>
-
- <build>
-
- <nagEmailAddress>pluto-dev@jakarta.apache.org</nagEmailAddress>
-
- <sourceDirectory>src/java</sourceDirectory>
- <aspectSourceDirectory/>
-
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
- <integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
-
- <integrationUnitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </integrationUnitTest>
-
-
- <resources>
- <resource>
- <directory>src/conf</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <jars/>
-
- </build>
</project>
Modified: portals/pluto/branches/pluto-1.1/deploy/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/deploy/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/deploy/project.xml Sat Oct 16 21:54:38 2004
@@ -36,7 +36,7 @@
<dependency>
<groupId>pluto</groupId>
<artifactId>pluto-binding</artifactId>
- <version>1.1</version>
+ <version>1.1-ALPHA</version>
</dependency>
<dependency>
Modified: portals/pluto/branches/pluto-1.1/maven.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/maven.xml (original)
+++ portals/pluto/branches/pluto-1.1/maven.xml Sat Oct 16 21:54:38 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project default="multiproject:artifact"
+<project default="pluto:deploy"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
@@ -27,14 +27,23 @@
<attainGoal name="multiproject:install"/>
</preGoal>
- <goal name="fullDeployment">
+
+ <goal name="pluto:deploy-all" prereqs="multiproject:install">
+ <attainGoal name="pluto:deploy-container"/>
+ <attainGoal name="pluto:deploy-testsuite"/>
+ </goal>
+
+ <goal name="pluto:deploy-container">
<maven:reactor
- basedir="${basedir}"
- includes="portal/project.xml"
- goals="tomcat:deploy"
- banner="Deploying Portal Driver"
- postProcessing="false"
- ignoreFailures="false"/>
+ basedir="${basedir}"
+ includes="portal/project.xml"
+ goals="tomcat:deploy"
+ banner="Deploying Pluto Portal Driver to Tomcat"
+ postProcessing="false"
+ ignoreFailures="false"/>
+ </goal>
+
+ <goal name="pluto:deploy-testsuite">
<maven:reactor
basedir="${basedir}"
includes="testsuite/project.xml"
@@ -43,5 +52,6 @@
postProcessing="false"
ignoreFailures="false"/>
</goal>
+
</project>
Modified: portals/pluto/branches/pluto-1.1/portal/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/portal/project.xml Sat Oct 16 21:54:38 2004
@@ -47,7 +47,7 @@
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils</url>
<properties>
<war.bundle>false</war.bundle>
@@ -66,7 +66,7 @@
<dependency>
<id>pluto</id>
<groupId>pluto</groupId>
- <version>1.1</version>
+ <version>1.1-ALPHA</version>
<properties>
<war.bundle>false</war.bundle>
<tomcat.shared>true</tomcat.shared>
@@ -76,7 +76,7 @@
<dependency>
<groupId>pluto</groupId>
<artifactId>pluto-binding</artifactId>
- <version>1.1</version>
+ <version>1.1-ALPHA</version>
<properties>
<war.bundle>false</war.bundle>
<tomcat.shared>true</tomcat.shared>
@@ -118,45 +118,4 @@
</properties>
</dependency>
</dependencies>
-
- <build>
-
- <nagEmailAddress>pluto-dev@jakarta.apache.org</nagEmailAddress>
-
- <sourceDirectory>src/java</sourceDirectory>
- <aspectSourceDirectory/>
-
- <resources>
- <resource>
- <directory>${basedir}/src/resources</directory>
- </resource>
- </resources>
-
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
- <integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
-
- <integrationUnitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </integrationUnitTest>
-
- <resources>
- <includes>
- <include>conf/**/*pipeline.xml</include>
- <include>conf/**/*valve.xml</include>
- </includes>
- </resources>
-
- <jars/>
-
- </build>
-
</project>
Modified: portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml (original)
+++ portals/pluto/branches/pluto-1.1/portal/src/webapp/WEB-INF/pluto-portal-driver-config.xml Sat Oct 16 21:54:38 2004
@@ -15,13 +15,6 @@
<window-state>minimized</window-state>
</supports>
- <host>
- <!-- Yuck, Yuck, Yuck -->
- <name>localhost</name>
- <http-port>8080</http-port>
- <https-port></https-port>
- </host>
-
<portlet-app>
<context-path>/testsuite</context-path>
<portlets>
@@ -40,30 +33,4 @@
<portlet context="/testsuite" name="TestPortlet2"/>
</page>
</render-config>
-
- <!--
- <aggregation>
- <fragment name="navigation" class="org.apache.pluto.driver.aggregation.navigation.TabNavigation"/>
- <fragment name="test" type="org.apache.pluto.driver.aggregation.PageFragment">
- <navigation>
- <title>Test</title>
- <description>...</description>
- </navigation>
-
- <fragment name="row" type="org.apache.pluto.driver.aggregation.RowFragment">
- <fragment name="col1" type="org.apache.pluto.driver.aggregation.ColumnFragment">
- <fragment name="p1" type="org.apache.pluto.driver.aggregation.PortletFragment">
- <property name="app-id" value="primary"/>
- <property name="portlet" value="TestPortlet1"/>
- </fragment>
-
- <fragment name="p2" type="org.apache.pluto.driver.aggregation.PortletFragment">
- <property name="app-id" value="secondary"/>
- <property name="portlet" value="TestPortlet2"/>
- </fragment>
- </fragment>
- </fragment>
- </fragment>
- </aggregation>
- -->
</pluto-portal-driver>
Modified: portals/pluto/branches/pluto-1.1/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/project.xml Sat Oct 16 21:54:38 2004
@@ -20,7 +20,7 @@
<name>portals-pluto</name>
<id>pluto-project</id>
<groupId>pluto</groupId>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>1.1-ALPHA</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://portals.apache.org/</url>
@@ -53,9 +53,9 @@
<siteDirectory>/www/portals.apache.org/pluto/</siteDirectory>
<repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/portals/pluto/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/pluto/branches/pluto-1.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/pluto/branches/pluto-1.1</developerConnection>
+ <url>http://svn.apache.org/repos/asf/portals/pluto/branches/pluto-1.1</url>
</repository>
<mailingLists>
@@ -79,168 +79,69 @@
</mailingList>
</mailingLists>
- <developers>
- <developer>
- <name>Jeffrey D. Brekke</name>
- <id/>
- <email>ekkerbj{aT}netscape{d0t}net</email>
- <organization/>
- </developer>
- <developer>
- <name>Santiago Gala</name>
- <id/>
- <email>sgala{aT}hisitech{d0t}com</email>
- <organization/>
- </developer>
- <developer>
- <name>Raphael Luta</name>
- <id/>
- <email>raphael{aT}apache{d0t}org</email>
- <organization/>
- </developer>
- <developer>
- <name>Neeme Praks</name>
- <id/>
- <email>neeme{aT}one{d0t}lv</email>
- <organization/>
- </developer>
- <developer>
- <name>Jeff Prickett</name>
- <id>prickett</id>
- <email>jeffprickett{aT}mindspring{d0t}com</email>
- <organization/>
- </developer>
- <developer>
- <name>Ingo Schuster</name>
- <id>ingo</id>
- <email>ingo{aT}raleigh{d0t}ibm{d0t}com</email>
- <organization/>
- </developer>
- <developer>
- <name>Paul Spencer</name>
- <id>paulsp</id>
- <email>paulsp{aT}apache{d0t}org</email>
- <organization/>
- </developer>
- <developer>
- <name>David S. Taylor</name>
- <id>taylor</id>
- <email>david{aT}bluesunrise{d0t}com</email>
- <organization/>
- </developer>
- <developer>
- <name>Kevin A. Burton</name>
- <id>burton</id>
- <email>burton{aT}relativity{d0t}yi{d0t}org</email>
- <organization/>
- </developer>
- <developer>
- <name>Chris Kimpton</name>
- <id>kimptoc</id>
- <email>kimptoc{d0t}mail{aT}bigfoot{d0t}com</email>
- <organization/>
- </developer>
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <email>jason{aT}zenplex{d0t}com</email>
- <organization>Zenplex</organization>
- </developer>
- <developer>
- <name>Mark Orciuch</name>
- <id>morciuch</id>
- <email>morciuch{aT}apache{d0t}org</email>
- </developer>
- <developer>
- <name/>
- <id>ggolden</id>
- <email/>
- </developer>
-
- <developer>
- <name/>
- <id>shesmer</id>
- <email/>
- </developer>
-
- <developer>
- <name/>
- <id>nacho</id>
- <email/>
- </developer>
-
- <developer>
- <name/>
- <id>akempf</id>
- <email/>
- </developer>
-
- <developer>
- <name>Scott T. Weaver</name>
- <id>weaver</id>
- <email>weaver{aT}apache{d0t}org</email>
- </developer>
-
- <developer>
- <name/>
- <id>jford</id>
- <email/>
- </developer>
-
- <developer>
- <name/>
- <id>aurelien</id>
- <email/>
- </developer>
-
- <developer>
- <name/>
- <id>rubys</id>
- <email/>
- </developer>
-
- <developer>
- <name>Michael Blum</name>
- <id>blumm</id>
- <email>blumm{aT}apache{d0t}org</email>
- </developer>
-
- <developer>
- <name>Stefan Hepper</name>
- <id>sthepper</id>
- <email>sthepper{aT}apache{d0t}org</email>
- </developer>
-
- <developer>
- <name>Carsten Ziegeler</name>
- <id>cziegeler</id>
- <email>cziegeler{aT}apache{d0t}org</email>
- </developer>
-
- <developer>
- <name>David DeWolf</name>
- <id>ddewolf</id>
- <email>ddewolf{aT}apache{d0t}org</email>
- <timezone>-4</timezone>
- <organization>Vivare, INC</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Nick Lothian</name>
- <id>nlothian</id>
- <email>nlothian{aT}apache{d0t}org</email>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Michael Westbay</name>
- <email>westbay{aT}users{d0T}sourceforge{d0T}net</email>
- </contributor>
- </contributors>
+<developers>
+ <developer>
+ <name>Santiago Gala</name>
+ <id/>
+ <email>sgala{aT}hisitech{d0t}com</email>
+ <organization/>
+ </developer>
+
+ <developer>
+ <name>David S. Taylor</name>
+ <id>taylor</id>
+ <email>david{aT}bluesunrise{d0t}com</email>
+ <organization/>
+ </developer>
+
+ <developer>
+ <name/>
+ <id>shesmer</id>
+ <email/>
+ </developer>
+
+ <developer>
+ <name>Scott T. Weaver</name>
+ <id>weaver</id>
+ <email>weaver{aT}apache{d0t}org</email>
+ </developer>
+
+ <developer>
+ <name>Michael Blum</name>
+ <id>blumm</id>
+ <email>blumm{aT}apache{d0t}org</email>
+ </developer>
+
+ <developer>
+ <name>Stefan Hepper</name>
+ <id>sthepper</id>
+ <email>sthepper{aT}apache{d0t}org</email>
+ </developer>
+
+ <developer>
+ <name>Carsten Ziegeler</name>
+ <id>cziegeler</id>
+ <email>cziegeler{aT}apache{d0t}org</email>
+ </developer>
+
+ <developer>
+ <name>David DeWolf</name>
+ <id>ddewolf</id>
+ <email>ddewolf{aT}apache{d0t}org</email>
+ <timezone>-4</timezone>
+ <organization>Vivare, INC</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Nick Lothian</name>
+ <id>nlothian</id>
+ <email>nlothian{aT}apache{d0t}org</email>
+ </developer>
+</developers>
+
<build>
<nagEmailAddress>pluto-dev@portals.apache.org</nagEmailAddress>
Added: portals/pluto/branches/pluto-1.1/testsuite/build.properties.sample
==============================================================================
--- (empty file)
+++ portals/pluto/branches/pluto-1.1/testsuite/build.properties.sample Sat Oct 16 21:54:38 2004
@@ -0,0 +1 @@
+pluto.testsuite.dir=\portals-pluto\testsuite
Modified: portals/pluto/branches/pluto-1.1/testsuite/maven.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/maven.xml (original)
+++ portals/pluto/branches/pluto-1.1/testsuite/maven.xml Sat Oct 16 21:54:38 2004
@@ -14,40 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project default="deployTestsuite"
+<project default="tomcat:deploy"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
-<!--
- <preGoal name="war">
- <maven:reactor
- basedir="${pluto.testsuite.dir}"
- includes="project.xml"
- goals="war:war"
- postProcessing="false"
- ignoreFailures="false"/>
- </preGoal>
--->
-
<!-- The multiproject won't let us call war directly, we must specify
since it won't be set by war goal. -->
- <preGoal name="deployTestsuite">
- <j:set var="maven.war.final.name" value="testsuite.war"/>
- </preGoal>
-
- <goal name="deployTestsuite">
- <java classname="org.apache.pluto.portalImpl.Deploy" fork="yes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement path="${maven.build.dest}"/>
- </classpath>
- <arg value="${maven.tomcat.home}/webapps"/>
- <arg value="pluto"/>
- <arg value="${basedir}/target/${maven.war.final.name}"/>
- <arg value=".."/>
- </java>
- </goal>
<preGoal name="tomcat:deploy">
<j:set var="maven.war.final.name" value="testsuite.war"/>
</preGoal>
Modified: portals/pluto/branches/pluto-1.1/testsuite/project.properties
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/project.properties (original)
+++ portals/pluto/branches/pluto-1.1/testsuite/project.properties Sat Oct 16 21:54:38 2004
@@ -15,6 +15,20 @@
# limitations under the License.
#
#
+
+#############################################
+############# Build Properties ##############
+# #
+# So as to not duplicate the testsuite code #
+# we will simply use the testsuite located #
+# in the main branch. #
+# #
+#############################################
+
+maven.war.src=${pluto.testsuite.dir}/src/webapp
+maven.war.src.includes=**/*
+maven.war.webxml=${basedir}/src/webapp/WEB-INF/web.xml
+
# Display the date on the Maven web site
maven.xdoc.date = left
@@ -35,6 +49,4 @@
maven.tomcat.context.config=src/conf/testsuite.xml
maven.tomcat.deploy=exploded
-maven.war.src=${pluto.testsuite.dir}/src/webapp
-maven.war.src.includes=**/*
-maven.war.webxml=${basedir}/src/webapp/WEB-INF/web.xml
+
Modified: portals/pluto/branches/pluto-1.1/testsuite/project.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/project.xml (original)
+++ portals/pluto/branches/pluto-1.1/testsuite/project.xml Sat Oct 16 21:54:38 2004
@@ -34,14 +34,6 @@
<dependencies>
<dependency>
- <id>castor</id>
- <version>0.9.5</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
@@ -68,7 +60,7 @@
<dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.6</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -76,7 +68,7 @@
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils</url>
<properties>
<war.bundle>true</war.bundle>
@@ -93,6 +85,10 @@
</dependency>
</dependencies>
+
+<build>
+ <sourceDirectory>${pluto.testsuite.dir}/src/java</sourceDirectory>
+</build>
<reports>
Modified: portals/pluto/branches/pluto-1.1/xdocs/todo.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/xdocs/todo.xml (original)
+++ portals/pluto/branches/pluto-1.1/xdocs/todo.xml Sat Oct 16 21:54:38 2004
@@ -53,6 +53,9 @@
by read from properties files and internationalized.</td>
<td>Container</td>
<td> Yes </td></tr>
+ <tr><td>Implement Strategy for providing user attributes.</td>
+ <td>Container / Portal Driver</td>
+ <td> No </td></tr>
</table>
</P>
</section>