portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r946581 - in /portals/applications/sandbox/content/trunk: ./ apa-content-portlet/ apa-content-portlet/src/main/java/org/apache/portals/applications/content/demo/beans/ apa-content-portlet/src/main/java/org/apache/portals/applications/conten...
Date Thu, 20 May 2010 09:32:52 GMT
Author: woonsan
Date: Thu May 20 09:32:52 2010
New Revision: 946581

URL: http://svn.apache.org/viewvc?rev=946581&view=rev
Log:
Refining dependencies
- Rename apa-content-tools to apa-cotent-utils in order to include ant tasks and jndi utils
  because jndi utils seems temporary solution; jndi providers of repo and ocm provider should
be provided by the providers later.
  That's why I moved those from apa-content-portlet to apa-content-utils.
- Move demo beans to apa-content-webapp from apa-content-portlet because demo is just demo
for an example.

Added:
    portals/applications/sandbox/content/trunk/apa-content-utils/
      - copied from r946566, portals/applications/sandbox/content/trunk/apa-content-tools/
    portals/applications/sandbox/content/trunk/apa-content-utils/src/main/java/org/apache/portals/applications/content/jndi/
      - copied from r946566, portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/java/org/apache/portals/applications/content/jndi/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/
    portals/applications/sandbox/content/trunk/apa-content-webapp/src/main/java/org/apache/portals/applications/content/demo/beans/
      - copied from r946566, portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/java/org/apache/portals/applications/content/demo/beans/
Removed:
    portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/java/org/apache/portals/applications/content/demo/beans/
    portals/applications/sandbox/content/trunk/apa-content-portlet/src/main/java/org/apache/portals/applications/content/jndi/
    portals/applications/sandbox/content/trunk/apa-content-tools/
Modified:
    portals/applications/sandbox/content/trunk/apa-content-portlet/pom.xml
    portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml
    portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
    portals/applications/sandbox/content/trunk/pom.xml

Modified: portals/applications/sandbox/content/trunk/apa-content-portlet/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-portlet/pom.xml?rev=946581&r1=946580&r2=946581&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-portlet/pom.xml (original)
+++ portals/applications/sandbox/content/trunk/apa-content-portlet/pom.xml Thu May 20 09:32:52
2010
@@ -50,19 +50,21 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
+      <scope>provided</scope>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-content-utils</artifactId>
+      <version>${project.version}</version>
     </dependency>
     
     <dependency>
@@ -71,11 +73,6 @@
     </dependency>
     
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.1_spec</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>

Modified: portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml?rev=946581&r1=946566&r2=946581&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml (original)
+++ portals/applications/sandbox/content/trunk/apa-content-utils/pom.xml Thu May 20 09:32:52
2010
@@ -24,10 +24,10 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>apa-content-tools</artifactId>
+  <artifactId>apa-content-utils</artifactId>
   <packaging>jar</packaging>
-  <name>Apache Portals Applications Content Tools</name>
-  <description>Content Portlet Application Tools</description>
+  <name>Apache Portals Applications Content Utils</name>
+  <description>Content Portlet Application Utils</description>
 
   <dependencies>
     
@@ -44,13 +44,20 @@
     </dependency>
     
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <scope>provided</scope>
     </dependency>
     
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-rmi</artifactId>
+      <artifactId>jackrabbit-ocm</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     
   </dependencies>

Modified: portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml?rev=946581&r1=946580&r2=946581&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml (original)
+++ portals/applications/sandbox/content/trunk/apa-content-webapp/pom.xml Thu May 20 09:32:52
2010
@@ -32,15 +32,24 @@
   <dependencies>
     
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>org.apache.portals.applications</groupId>
       <artifactId>apa-content-portlet</artifactId>
       <version>${project.version}</version>
-      <scope>runtime</scope>
     </dependency>
     
     <dependency>
       <groupId>org.apache.portals.applications</groupId>
-      <artifactId>apa-content-tools</artifactId>
+      <artifactId>apa-content-utils</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>

Modified: portals/applications/sandbox/content/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/sandbox/content/trunk/pom.xml?rev=946581&r1=946580&r2=946581&view=diff
==============================================================================
--- portals/applications/sandbox/content/trunk/pom.xml (original)
+++ portals/applications/sandbox/content/trunk/pom.xml Thu May 20 09:32:52 2010
@@ -92,6 +92,28 @@ limitations under the License.
         <artifactId>apa-gems</artifactId>
         <version>${portals.applications.apa-gems.version}</version>
         <scope>runtime</scope>
+         <exclusions>
+          <exclusion>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc-portlet</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
@@ -245,8 +267,8 @@ limitations under the License.
   <!-- Application Modules -->
 
   <modules>
+    <module>apa-content-utils</module>
     <module>apa-content-portlet</module>
-    <module>apa-content-tools</module>
     <module>apa-content-webapp</module>
   </modules>
 



Mime
View raw message