portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r707550 - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components: jetspeed-layout-portlets/ jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/ jetspeed-portal/src/main/java/org/apache/jetspeed/util/descr...
Date Fri, 24 Oct 2008 05:41:55 GMT
Author: taylor
Date: Thu Oct 23 22:41:55 2008
New Revision: 707550

URL: http://svn.apache.org/viewvc?rev=707550&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-871
fix a few odd errors that were short-circuiting build. this allows me to start wiring the
jetspeed-portal project with pluto 2.0
components still not building (all others build): page-manager, portal, registry, security,
security-schema (no pom), sso

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/pom.xml
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletRule.java

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/pom.xml?rev=707550&r1=707549&r2=707550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/pom.xml
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-layout-portlets/pom.xml
Thu Oct 23 22:41:55 2008
@@ -57,6 +57,10 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=707550&r1=707549&r2=707550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Thu Oct 23 22:41:55 2008
@@ -309,7 +309,7 @@
 
             // Make sure existing entities are refreshed with the most
             // recent PortletDefintion.
-            for (PortletDefinition pd : pa.getPortlets()))
+            for (PortletDefinition pd : pa.getPortlets())
             {
                 Collection portletEntites = entityAccess.getPortletEntities(pd);
                 if(portletEntites != null && portletEntites.size() > 0)

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletRule.java?rev=707550&r1=707549&r2=707550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletRule.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/descriptor/PortletRule.java
Thu Oct 23 22:41:55 2008
@@ -41,7 +41,6 @@
     {
         PortletApplicationDefinitionImpl app = (PortletApplicationDefinitionImpl) digester.getRoot();
         digester.push(app.addPortletDefinition());
-);
     }
     /**
      * <p>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message