portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r1606415 - in /portals/applications/webcontent/trunk: ./ content-rewriter/ content-rewriter/src/ content-rewriter/src/main/ content-rewriter/src/main/java/ content-rewriter/src/main/resources/ content-rewriter/src/test/ content-rewriter/src...
Date Sun, 29 Jun 2014 02:09:09 GMT
Author: woonsan
Date: Sun Jun 29 02:09:09 2014
New Revision: 1606415

URL: http://svn.apache.org/r1606415
Log:
APA-57: maven project restructuring - adding content-rewriter and reverse-proxy modules

Added:
    portals/applications/webcontent/trunk/content-rewriter/   (with props)
    portals/applications/webcontent/trunk/content-rewriter/pom.xml
    portals/applications/webcontent/trunk/content-rewriter/src/
    portals/applications/webcontent/trunk/content-rewriter/src/main/
    portals/applications/webcontent/trunk/content-rewriter/src/main/java/
    portals/applications/webcontent/trunk/content-rewriter/src/main/resources/
    portals/applications/webcontent/trunk/content-rewriter/src/test/
    portals/applications/webcontent/trunk/content-rewriter/src/test/java/
    portals/applications/webcontent/trunk/content-rewriter/src/test/resources/
    portals/applications/webcontent/trunk/reverse-proxy/   (with props)
    portals/applications/webcontent/trunk/reverse-proxy/pom.xml
    portals/applications/webcontent/trunk/reverse-proxy/src/
    portals/applications/webcontent/trunk/reverse-proxy/src/main/
    portals/applications/webcontent/trunk/reverse-proxy/src/main/java/
    portals/applications/webcontent/trunk/reverse-proxy/src/main/resources/
    portals/applications/webcontent/trunk/reverse-proxy/src/test/
    portals/applications/webcontent/trunk/reverse-proxy/src/test/java/
    portals/applications/webcontent/trunk/reverse-proxy/src/test/resources/
Modified:
    portals/applications/webcontent/trunk/pom.xml
    portals/applications/webcontent/trunk/portlets/pom.xml
    portals/applications/webcontent/trunk/war/pom.xml

Propchange: portals/applications/webcontent/trunk/content-rewriter/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 29 02:09:09 2014
@@ -0,0 +1 @@
+target

Added: portals/applications/webcontent/trunk/content-rewriter/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/content-rewriter/pom.xml?rev=1606415&view=auto
==============================================================================
--- portals/applications/webcontent/trunk/content-rewriter/pom.xml (added)
+++ portals/applications/webcontent/trunk/content-rewriter/pom.xml Sun Jun 29 02:09:09 2014
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with this
+  work for additional information regarding copyright ownership. The ASF
+  licenses this file to You under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+  or agreed to in writing, software distributed under the License is
+  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the specific language
+  governing permissions and limitations under the License. $Id: pom.xml 765879
+  2009-04-17 07:36:52Z woonsan $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-webcontent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apa-webcontent-content-rewriter</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Portals Applications Web Content Content Rewriter</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>

Modified: portals/applications/webcontent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/pom.xml?rev=1606415&r1=1606414&r2=1606415&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/pom.xml (original)
+++ portals/applications/webcontent/trunk/pom.xml Sun Jun 29 02:09:09 2014
@@ -30,15 +30,299 @@
   <version>2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Portals Applications Web Content Application</name>
-  <description>
-        Web Content Application
-    </description>
+  <description>Web Content Application</description>
+
+  <properties>
+    <portlet-api.version>1.0</portlet-api.version>
+    <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
+    <javax.servlet.version>2.4</javax.servlet.version>
+    <org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+    <org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
+    <slf4j.version>1.5.6</slf4j.version>
+    <junit.version>3.8.1</junit.version>
+    <nekohtml.version>0.9.5</nekohtml.version>
+    <castor.version>1.1.1</castor.version>
+    <httpcomponents-httpcore.version>4.0.1</httpcomponents-httpcore.version>
+    <httpcomponents-httpclient.version>4.0</httpcomponents-httpclient.version>
+    <jcip-annotations.version>1.0</jcip-annotations.version>
+    <commons-lang.version>2.4</commons-lang.version>
+    <commons-io.version>1.4</commons-io.version>
+    <commons-httpclient.version>3.0.1</commons-httpclient.version>
+    <commons-beanutils.version>1.8.0</commons-beanutils.version>
+    <commons-configuration.version>1.6</commons-configuration.version>
+    <commons-digester.version>1.8</commons-digester.version>
+    <oro.version>2.0.8</oro.version>
+    <velocity.version>1.6.3</velocity.version>
+    <velocity-tools.version>1.3</velocity-tools.version>
+  </properties>
+
+  <dependencyManagement>
+
+    <dependencies>
+
+      <dependency>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>portlet-api_2.0_spec</artifactId>
+        <version>${portals.portlet2-api-spec.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${javax.servlet.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-common</artifactId>
+        <version>${org.apache.portals.bridges.common.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-velocity</artifactId>
+        <version>${org.apache.portals.bridges.velocity.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.codehaus.castor</groupId>
+        <artifactId>castor</artifactId>
+        <version>${castor.version}</version>
+        <exclusions>
+          <!-- we only use/need the XML handling: excluding all other, non-test, dependencies
-->
+          <exclusion>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-full</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>jakarta-regexp</groupId>
+            <artifactId>jakarta-regexp</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ldapsdk</groupId>
+            <artifactId>ldapsdk</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xerces</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>nekohtml</groupId>
+        <artifactId>nekohtml</artifactId>
+        <version>${nekohtml.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${httpcomponents-httpcore.version}</version>
+      </dependency>
+
+      <!-- jcip-annotations is required to compile with httpclient and Java 1.5. See HTTPCLIENT-866.
-->
+      <dependency>
+        <groupId>net.jcip</groupId>
+        <artifactId>jcip-annotations</artifactId>
+        <version>${jcip-annotations.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpcomponents-httpclient.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${commons-lang.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>${commons-digester.version}</version>
+        <scope>runtime</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>${commons-httpclient.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>${commons-beanutils.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>${commons-configuration.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+              <groupId>commons-beanutils</groupId>
+              <artifactId>commons-beanutils-core</artifactId>            
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <version>${oro.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>junit-addons</groupId>
+            <artifactId>junit-addons-runner</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>${velocity.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-tools</artifactId>
+        <version>${velocity-tools.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>sslext</groupId>
+            <artifactId>sslext</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>struts</groupId>
+            <artifactId>struts</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+    </dependencies>
+
+  </dependencyManagement>
 
   <!-- Application Modules -->
 
   <modules>
+    <module>content-rewriter</module>
+    <module>reverse-proxy</module>
     <module>portlets</module>
-    <module>webcontent-war</module>
+    <module>war</module>
   </modules>
 
   <!-- Project Information -->

Modified: portals/applications/webcontent/trunk/portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/portlets/pom.xml?rev=1606415&r1=1606414&r2=1606415&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/portlets/pom.xml (original)
+++ portals/applications/webcontent/trunk/portlets/pom.xml Sun Jun 29 02:09:09 2014
@@ -28,267 +28,128 @@
   <packaging>jar</packaging>
   <name>Apache Portals Applications Web Content Portlets</name>
 
-  <properties>
-    <portlet-api.version>1.0</portlet-api.version>
-    <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
-    <javax.servlet.version>2.4</javax.servlet.version>
-    <org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
-    <org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
-    <slf4j.version>1.5.6</slf4j.version>
-    <junit.version>3.8.1</junit.version>
-    <nekohtml.version>0.9.5</nekohtml.version>
-    <castor.version>1.1.1</castor.version>
-    <httpcomponents-httpcore.version>4.0.1</httpcomponents-httpcore.version>
-    <httpcomponents-httpclient.version>4.0</httpcomponents-httpclient.version>
-    <jcip-annotations.version>1.0</jcip-annotations.version>
-    <commons-lang.version>2.4</commons-lang.version>
-    <commons-io.version>1.4</commons-io.version>
-    <commons-httpclient.version>3.0.1</commons-httpclient.version>
-    <commons-beanutils.version>1.8.0</commons-beanutils.version>
-    <commons-configuration.version>1.6</commons-configuration.version>
-    <oro.version>2.0.8</oro.version>
-    <velocity.version>1.6.3</velocity.version>
-    <velocity-tools.version>1.3</velocity-tools.version>
-  </properties>
-
-  <!-- Dependencies -->
-
   <dependencies>
 
-    <!-- Build Dependencies -->
-    <!--
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${portlet-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    -->
     <dependency>
       <groupId>org.apache.portals</groupId>
       <artifactId>portlet-api_2.0_spec</artifactId>
-      <version>${portals.portlet2-api-spec.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>${javax.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.portals.bridges</groupId>
       <artifactId>portals-bridges-common</artifactId>
-      <version>${org.apache.portals.bridges.common.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.apache.portals.bridges</groupId>
       <artifactId>portals-bridges-velocity</artifactId>
-      <version>${org.apache.portals.bridges.velocity.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity-tools</groupId>
-          <artifactId>velocity-tools</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
-    <!-- Build Dependencies -->
+
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-webcontent-reverse-proxy</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.codehaus.castor</groupId>
       <artifactId>castor</artifactId>
-      <version>${castor.version}</version>
-      <exclusions>
-        <!-- we only use/need the XML handling: excluding all other, non-test, dependencies
-->
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-full</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>oro</groupId>
-          <artifactId>oro</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jakarta-regexp</groupId>
-          <artifactId>jakarta-regexp</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.transaction</groupId>
-          <artifactId>jta</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ldapsdk</groupId>
-          <artifactId>ldapsdk</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xerces</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
-      <version>${nekohtml.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
-      <version>${httpcomponents-httpcore.version}</version>
     </dependency>
+
     <!-- jcip-annotations is required to compile with httpclient and Java 1.5. See HTTPCLIENT-866.
-->
     <dependency>
       <groupId>net.jcip</groupId>
       <artifactId>jcip-annotations</artifactId>
-      <version>${jcip-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${httpcomponents-httpclient.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>${commons-lang.version}</version>
     </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
     </dependency>
+
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>${commons-httpclient.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>${commons-beanutils.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>${commons-configuration.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>            
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
-      <version>${oro.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>junit-addons</groupId>
-          <artifactId>junit-addons-runner</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>${velocity.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools</artifactId>
-      <version>${velocity-tools.version}</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>sslext</groupId>
-          <artifactId>sslext</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>struts</groupId>
-          <artifactId>struts</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
   </dependencies>
+
 </project>

Propchange: portals/applications/webcontent/trunk/reverse-proxy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 29 02:09:09 2014
@@ -0,0 +1 @@
+target

Added: portals/applications/webcontent/trunk/reverse-proxy/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/reverse-proxy/pom.xml?rev=1606415&view=auto
==============================================================================
--- portals/applications/webcontent/trunk/reverse-proxy/pom.xml (added)
+++ portals/applications/webcontent/trunk/reverse-proxy/pom.xml Sun Jun 29 02:09:09 2014
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements. See the NOTICE file distributed with this
+  work for additional information regarding copyright ownership. The ASF
+  licenses this file to You under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+  or agreed to in writing, software distributed under the License is
+  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the specific language
+  governing permissions and limitations under the License. $Id: pom.xml 765879
+  2009-04-17 07:36:52Z woonsan $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.portals.applications</groupId>
+    <artifactId>apa-webcontent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apa-webcontent-reverse-proxy</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Portals Applications Web Content Reverse Proxy</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-webcontent-content-rewriter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+
+    <!-- jcip-annotations is required to compile with httpclient and Java 1.5. See HTTPCLIENT-866.
-->
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>

Modified: portals/applications/webcontent/trunk/war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/war/pom.xml?rev=1606415&r1=1606414&r2=1606415&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/war/pom.xml (original)
+++ portals/applications/webcontent/trunk/war/pom.xml Sun Jun 29 02:09:09 2014
@@ -18,67 +18,50 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- POM Identification -->
-  <artifactId>apa-webcontent-war</artifactId>
   <parent>
     <groupId>org.apache.portals.applications</groupId>
     <artifactId>apa-webcontent</artifactId>
     <version>2.0-SNAPSHOT</version>
   </parent>
+
+  <artifactId>apa-webcontent-war</artifactId>
   <packaging>war</packaging>
   <name>Apache Portals Applications Web Content WAR</name>
 
-  <!-- Dependencies -->
-  <properties>
-    <javax.servlet.version>2.4</javax.servlet.version>
-    <org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
-    <commons-digester.version>1.8</commons-digester.version>
-    <slf4j.version>1.5.6</slf4j.version>
-    <oro.version>2.0.8</oro.version>
-  </properties>
-
   <dependencies>
 
-    <!-- Runtime Dependencies -->
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>${javax.servlet.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.portals.bridges</groupId>
       <artifactId>portals-bridges-common</artifactId>
-      <version>${org.apache.portals.bridges.common.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apa-webcontent-jar</artifactId>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-webcontent-portlets</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
+
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>${commons-digester.version}</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
   </dependencies>



Mime
View raw message