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 05:48:59 UTC
svn commit: rev 54949 - in portals/pluto/branches/pluto-1.1: . binding container container/src/java/org/apache/pluto/core portal testsuite
Author: ddewolf
Date: Sat Oct 16 20:48:59 2004
New Revision: 54949
Modified:
portals/pluto/branches/pluto-1.1/binding/project.properties
portals/pluto/branches/pluto-1.1/binding/project.xml
portals/pluto/branches/pluto-1.1/container/project.xml
portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/PortletInvoker.java
portals/pluto/branches/pluto-1.1/portal/portal.iml
portals/pluto/branches/pluto-1.1/portal/project.xml
portals/pluto/branches/pluto-1.1/portals-pluto.ipr
portals/pluto/branches/pluto-1.1/project.xml
portals/pluto/branches/pluto-1.1/testsuite/project.xml
portals/pluto/branches/pluto-1.1/testsuite/testsuite.iml
Log:
Updating project files to reflect correction versions / names / dependencies.
Modified: portals/pluto/branches/pluto-1.1/binding/project.properties
==============================================================================
--- portals/pluto/branches/pluto-1.1/binding/project.properties (original)
+++ portals/pluto/branches/pluto-1.1/binding/project.properties Sat Oct 16 20:48:59 2004
@@ -1,3 +1,5 @@
maven.checkstyle.properties=${basedir}/../checkstyle.xml
maven.checkstyle.headerfile=${basedir}/../LICENSE.TXT
maven.license.licenseFile=${basedir}/../LICENSE.TXT
+
+maven.multiproject.type=jar
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 20:48:59 2004
@@ -17,8 +17,9 @@
-->
<project>
<extend>${basedir}/../project.xml</extend>
- <name>Portlet OM and Bindings </name>
- <id>pluto-binding</id>
+ <name>Portlet Deployment Descripter Bindings </name>
+ <groupId>pluto</groupId>
+ <artifactId>pluto-binding</artifactId>
<organization>
<logo>/../../images/apache-portals.gif</logo>
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 20:48:59 2004
@@ -18,7 +18,8 @@
<project>
<extend>${basedir}/../project.xml</extend>
<name>Pluto Portlet Container</name>
- <id>pluto</id>
+ <groupId>pluto</groupId>
+ <artifactId>pluto</artifactId>
<organization>
<logo>/../../images/apache-portals.gif</logo>
@@ -65,7 +66,7 @@
<dependency>
<groupId>pluto</groupId>
<artifactId>pluto-binding</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
</dependency>
<dependency>
Modified: portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/PortletInvoker.java
==============================================================================
--- portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/PortletInvoker.java (original)
+++ portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/PortletInvoker.java Sat Oct 16 20:48:59 2004
@@ -186,7 +186,8 @@
}
} else {
LOG.error(
- "PortletInvoker.action() - Unable to find RequestDispatcher.");
+ "PortletInvoker.action() - Unable to find RequestDispatcher ["+uri+"].");
+ throw new PortletException("Unable to find dispatcher for the portlet located at: "+uri);
}
}
Modified: portals/pluto/branches/pluto-1.1/portal/portal.iml
==============================================================================
--- portals/pluto/branches/pluto-1.1/portal/portal.iml (original)
+++ portals/pluto/branches/pluto-1.1/portal/portal.iml Sat Oct 16 20:48:59 2004
@@ -20,7 +20,6 @@
<orderEntry type="library" name="commons-logging-1.0.3" level="application" />
<orderEntry type="library" name="commons-digester-1.5" level="application" />
<orderEntry type="library" name="jstl-standard-1.0.4" level="application" />
- <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
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 20:48:59 2004
@@ -66,7 +66,7 @@
<dependency>
<id>pluto</id>
<groupId>pluto</groupId>
- <version>1.0.1</version>
+ <version>1.1</version>
<properties>
<war.bundle>false</war.bundle>
<tomcat.shared>true</tomcat.shared>
@@ -74,9 +74,9 @@
</dependency>
<dependency>
- <id>pluto-binding</id>
<groupId>pluto</groupId>
- <version>1.0.1</version>
+ <artifactId>pluto-binding</artifactId>
+ <version>1.1</version>
<properties>
<war.bundle>false</war.bundle>
<tomcat.shared>true</tomcat.shared>
Modified: portals/pluto/branches/pluto-1.1/portals-pluto.ipr
==============================================================================
--- portals/pluto/branches/pluto-1.1/portals-pluto.ipr (original)
+++ portals/pluto/branches/pluto-1.1/portals-pluto.ipr Sat Oct 16 20:48:59 2004
@@ -229,6 +229,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/binding/binding.iml" filepath="$PROJECT_DIR$/binding/binding.iml" />
<module fileurl="file://$PROJECT_DIR$/container/container.iml" filepath="$PROJECT_DIR$/container/container.iml" />
+ <module fileurl="file://$PROJECT_DIR$/deploy/deploy.iml" filepath="$PROJECT_DIR$/deploy/deploy.iml" />
<module fileurl="file://$PROJECT_DIR$/portal/portal.iml" filepath="$PROJECT_DIR$/portal/portal.iml" />
<module fileurl="file://$PROJECT_DIR$/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/testsuite/testsuite.iml" />
</modules>
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 20:48:59 2004
@@ -20,7 +20,7 @@
<name>portals-pluto</name>
<id>pluto-project</id>
<groupId>pluto</groupId>
- <currentVersion>1.0.1</currentVersion>
+ <currentVersion>1.1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://portals.apache.org/</url>
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 20:48:59 2004
@@ -42,23 +42,6 @@
</dependency>
<dependency>
- <id>pluto</id>
- <version>1.0.1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>pluto-portal</id>
- <groupId>pluto</groupId>
- <version>1.0.1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<id>portlet-api</id>
<groupId>portlet-api</groupId>
<version>1.0</version>
@@ -66,6 +49,7 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
+
<dependency>
<id>servletapi</id>
<version>2.3</version>
@@ -75,22 +59,6 @@
</dependency>
<dependency>
- <id>xerces</id>
- <version>2.3.0</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<id>jstl</id>
<version>1.0.2</version>
<properties>
@@ -126,55 +94,15 @@
</dependencies>
- <build>
-
- <nagEmailAddress>pluto-dev@jakarta.apache.org</nagEmailAddress>
-
- <sourceDirectory>${pluto.testsuite.dir}/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>
- <includes>
- <include>conf/**/*pipeline.xml</include>
- <include>conf/**/*valve.xml</include>
- </includes>
- </resources>
-
- <jars/>
-
- </build>
-
- <reports>
- <!--
- <report>maven-jdepend-plugin</report>
- -->
- <report>maven-checkstyle-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <!--
- <report>maven-junit-report-plugin</report>
- -->
- <report>maven-tasklist-plugin</report>
- </reports>
+<reports>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-tasklist-plugin</report>
+</reports>
</project>
Modified: portals/pluto/branches/pluto-1.1/testsuite/testsuite.iml
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/testsuite.iml (original)
+++ portals/pluto/branches/pluto-1.1/testsuite/testsuite.iml Sat Oct 16 20:48:59 2004
@@ -18,7 +18,6 @@
<orderEntry type="library" name="servlet-api-2.3" level="application" />
<orderEntry type="library" name="jstl-standard-1.0.4" level="application" />
<orderEntry type="library" name="commons-digester-1.5" level="application" />
- <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">