You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2017/09/16 14:57:13 UTC

svn commit: r1808557 - in /commons/proper/jelly/trunk/jelly-tags: ./ soap/ soap/src/java/org/apache/commons/jelly/tags/soap/ soap/src/main/ soap/src/main/java/ soap/src/main/java/org/ soap/src/main/java/org/apache/ soap/src/main/java/org/apache/commons...

Author: oheger
Date: Sat Sep 16 14:57:12 2017
New Revision: 1808557

URL: http://svn.apache.org/viewvc?rev=1808557&view=rev
Log:
Added soap tag lib to multi-module build.

Added:
    commons/proper/jelly/trunk/jelly-tags/soap/pom.xml
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/project.xml
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/package.html
      - copied, changed from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/package.html
Removed:
    commons/proper/jelly/trunk/jelly-tags/soap/maven.xml
    commons/proper/jelly/trunk/jelly-tags/soap/project.properties
    commons/proper/jelly/trunk/jelly-tags/soap/project.xml
    commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/StringInputStream.java
    commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/package.html
    commons/proper/jelly/trunk/jelly-tags/soap/src/test/org/apache/commons/jelly/tags/soap/example.jelly
Modified:
    commons/proper/jelly/trunk/jelly-tags/pom.xml
    commons/proper/jelly/trunk/jelly-tags/soap/build.xml

Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1808557&r1=1808556&r2=1808557&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 14:57:12 2017
@@ -40,6 +40,7 @@
     <module>ojb</module>
     <module>quartz</module>
     <module>regexp</module>
+    <module>soap</module>
     <module>swt</module>
     <module>util</module>
     <module>xml</module>

Modified: commons/proper/jelly/trunk/jelly-tags/soap/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/build.xml?rev=1808557&r1=1808556&r2=1808557&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/soap/build.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/soap/build.xml Sat Sep 16 14:57:12 2017
@@ -45,14 +45,14 @@
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="src/java">
+        <pathelement location="src/main/java">
         </pathelement>
       </src>
       <classpath refid="build.classpath">
       </classpath>
     </javac>
     <copy todir="${classesdir}">
-      <fileset dir="src/java">
+      <fileset dir="src/main/java">
         <include name="**/*.properties">
         </include>
       </fileset>

Copied: commons/proper/jelly/trunk/jelly-tags/soap/pom.xml (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/project.xml)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/soap/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/soap/project.xml&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/soap/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/soap/pom.xml Sat Sep 16 14:57:12 2017
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?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
@@ -6,46 +6,35 @@
   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
-
+  
+       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.
 -->
-<project>
-  <extend>${basedir}/../tag-project.xml</extend>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>commons-jelly</groupId>
+    <artifactId>commons-jelly-tags</artifactId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+
   <artifactId>commons-jelly-tags-soap</artifactId>
+  <packaging>jar</packaging>
   <name>commons-jelly-tags-soap</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.tags.soap</package>
-
-  <description>
-      This is a Jelly interface for SOAP.
-  </description>
-  <shortDescription>Commons Jelly SOAP Tag Library</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS-JELLY-SOAP-1_0</tag>
-    </version>
-  </versions>
+  <description>This is a Jelly interface for SOAP.</description>
 
   <dependencies>
-
     <!-- START for compilation -->
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
       <version>1.0</version>
-      <properties>
-        <gump.project>ws-axis</gump.project>
-        <gump.id>axis</gump.id>
-      </properties>
     </dependency>
 
     <dependency>
@@ -61,10 +50,6 @@
       <artifactId>jaxrpc-api</artifactId>
       <version>1.1-FCS</version>
       <url>http://java.sun.com/webservices/webservicespack.html</url>
-      <properties>
-        <gump.project>ws-axis</gump.project>
-        <gump.id>axis-jaxrpc</gump.id>
-      </properties>
     </dependency>
     -->    
 
@@ -75,10 +60,6 @@
       <artifactId>saaj-api</artifactId>
       <version>1.2-FCS</version>
       <url>http://java.sun.com/webservices/webservicespack.html</url>
-      <properties>
-        <gump.project>ws-axis</gump.project>
-        <gump.id>axis-saaj</gump.id>
-      </properties>
     </dependency>
     -->    
 
@@ -87,21 +68,11 @@
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-saaj</artifactId>
       <version>1.1-rc4</version>
-      <!-- Temporary until geronimo is under gump -->
-      <properties>
-        <gump.project>ws-axis</gump.project>
-        <gump.id>axis-saaj</gump.id>
-      </properties>
     </dependency>
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-jaxrpc</artifactId>
       <version>1.1-rc4</version>
-      <!-- Temporary until geronimo is under gump -->
-      <properties>
-        <gump.project>ws-axis</gump.project>
-        <gump.id>axis-jaxrpc</gump.id>
-      </properties>
     </dependency>
 
 		
@@ -109,35 +80,24 @@
       <groupId>jaxme</groupId>
       <artifactId>jaxme-api</artifactId>
       <version>0.3</version>
-      <properties>
-        <gump.project>ws-jaxme</gump.project>
-        <gump.id>api</gump.id>
-      </properties>
     </dependency>
 
-    <!-- START for running demos -->
+    <!-- END for compilation -->
+
+    <!-- Start for running demos -->
 
     <dependency>
-      <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
+      <groupId>commons-cli</groupId>
       <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-      <version>20030211.213356</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>servletapi</groupId>
       <artifactId>servletapi</artifactId>
       <version>2.3</version>
-      <url>http://java.sun.com/products/servlets/</url>
-      <properties>
-        <gump.project>jakarta-servletapi-5-servlet</gump.project>
-      </properties>
     </dependency>
-        
+
     <!-- END for running demos -->
   </dependencies>
-  
 </project>

Copied: commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java?p2=commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java&p1=commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeRawTag.java&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java?p2=commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/InvokeTag.java&p1=commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/InvokeTag.java&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/SoapTagLibrary.java&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/StringInputStream.java)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java?p2=commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/StringInputStream.java&p1=commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/StringInputStream.java&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
    (empty)

Copied: commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/package.html (from r1808556, commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/package.html)
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/package.html?p2=commons/proper/jelly/trunk/jelly-tags/soap/src/main/java/org/apache/commons/jelly/tags/soap/package.html&p1=commons/proper/jelly/trunk/jelly-tags/soap/src/java/org/apache/commons/jelly/tags/soap/package.html&r1=1808556&r2=1808557&rev=1808557&view=diff
==============================================================================
    (empty)