You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2005/08/06 22:05:17 UTC
svn commit: r230573 - in /geronimo/trunk: applications/console-ear/
applications/console-ear/src/plan/ applications/console-framework/
applications/console-framework/src/webapp/WEB-INF/data/xml/
applications/console-standard/ etc/ modules/assembly/
Author: jboynes
Date: Sat Aug 6 13:05:12 2005
New Revision: 230573
URL: http://svn.apache.org/viewcvs?rev=230573&view=rev
Log:
upgrade to SNAPSHOT version of Pluto which is currently RC4 tweaked to support maven uploading
Modified:
geronimo/trunk/applications/console-ear/project.xml
geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
geronimo/trunk/applications/console-framework/maven.xml
geronimo/trunk/applications/console-framework/project.xml
geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml
geronimo/trunk/applications/console-standard/project.xml
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/project.xml
Modified: geronimo/trunk/applications/console-ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/project.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/project.xml (original)
+++ geronimo/trunk/applications/console-ear/project.xml Sat Aug 6 13:05:12 2005
@@ -28,7 +28,7 @@
</dependency>
<dependency>
- <groupId>pluto</groupId>
+ <groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
</dependency>
Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Sat Aug 6 13:05:12 2005
@@ -9,7 +9,7 @@
<uri>portlet-api/jars/portlet-api-${portlet_api_version}.jar</uri>
</dependency>
<dependency>
- <uri>pluto/jars/pluto-${pluto_version}.jar</uri>
+ <uri>org.apache.pluto/jars/pluto-${pluto_version}.jar</uri>
</dependency>
<!-- Active MQ dependencies -->
Modified: geronimo/trunk/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/maven.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/maven.xml (original)
+++ geronimo/trunk/applications/console-framework/maven.xml Sat Aug 6 13:05:12 2005
@@ -6,18 +6,10 @@
xmlns:velocity="jelly:velocity"
xmlns:util="jelly:util">
- <preGoal name="war:war">
- <ant:unjar dest="${basedir}/target/${pom.artifactId}" src="${maven.repo.local}/pluto/wars/pluto-driver-${pluto_version}.war" overwrite="true">
- <patternset>
- <include name="WEB-INF/classes/**"/>
- </patternset>
- </ant:unjar>
- </preGoal>
-
<preGoal name="war:install">
<attainGoal name="preCompile"/>
</preGoal>
-
+
<!-- Output folder for compiled jsps. -->
<j:set var="outDir" value="${basedir}/target/${pom.artifactId}/WEB-INF/work"/>
Modified: geronimo/trunk/applications/console-framework/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/project.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/project.xml (original)
+++ geronimo/trunk/applications/console-framework/project.xml Sat Aug 6 13:05:12 2005
@@ -46,15 +46,25 @@
<version>${portlet_api_version}</version>
</dependency>
<dependency>
- <groupId>pluto</groupId>
+ <groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
</dependency>
<dependency>
- <groupId>pluto</groupId>
- <artifactId>pluto-driver</artifactId>
- <type>war</type>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
<version>${pluto_version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${pluto_version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
</dependency>
<dependency>
<groupId>castor</groupId>
Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml Sat Aug 6 13:05:12 2005
@@ -76,6 +76,10 @@
</class>
+ <class name="org.apache.pluto.portalImpl.om.servlet.impl.SecurityConstraintImpl">
+
+ </class>
+
<class name="org.apache.pluto.portalImpl.om.common.impl.DescriptionImpl">
<field name="description" type="java.lang.String">
@@ -262,9 +266,14 @@
<bind-xml name="error-page" node="element"/>
</field>
- <field name="securityConstraint" transient="true" direct="true">
- <bind-xml name="security-constraint" node="element"/>
- </field>
+ <field name="securityConstraints"
+ transient="true"
+ required="false"
+ type="org.apache.pluto.portalImpl.om.servlet.impl.SecurityConstraintImpl"
+ collection="collection">
+ <bind-xml name="security-constraint" node="element"/>
+ </field>
+
<field name="loginConfig" transient="true" direct="true">
<bind-xml name="login-config" node="element"/>
</field>
Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Sat Aug 6 13:05:12 2005
@@ -102,7 +102,7 @@
</dependency>
<!-- Portlet services manager dependencies -->
<dependency>
- <groupId>pluto</groupId>
+ <groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
</dependency>
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sat Aug 6 13:05:12 2005
@@ -145,7 +145,7 @@
mockobjects_version=0.09
mx4j_version=3.0.1
oro_version=2.0.8
-pluto_version=1.0.1-rc3
+pluto_version=1.0.1-SNAPSHOT
portlet_api_version=1.0
p2psockets_version=1.1.2
regexp_version=1.3
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=230573&r1=230572&r2=230573&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Sat Aug 6 13:05:12 2005
@@ -1220,7 +1220,7 @@
</dependency>
<dependency>
- <groupId>pluto</groupId>
+ <groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>${pluto_version}</version>
<properties>