You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2008/01/15 16:13:58 UTC
svn commit: r612133 - in /geronimo/yoko/trunk: ./ api/ bindings/ core/
distribution/ distribution/src/main/samples/orb/hello_world/
distribution/src/main/samples/ws/bank/
distribution/src/main/samples/ws/bank_ws_addressing/
distribution/src/main/sample...
Author: rickmcguire
Date: Tue Jan 15 07:13:56 2008
New Revision: 612133
URL: http://svn.apache.org/viewvc?rev=612133&view=rev
Log:
First pass at cleaning up the yoko code tree to be a Geronimo subproject
Removed:
geronimo/yoko/trunk/api/
geronimo/yoko/trunk/bindings/
geronimo/yoko/trunk/tools/
Modified:
geronimo/yoko/trunk/NOTICE
geronimo/yoko/trunk/core/pom.xml
geronimo/yoko/trunk/distribution/pom.xml
geronimo/yoko/trunk/distribution/src/main/samples/orb/hello_world/build.xml
geronimo/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml
geronimo/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/build.xml
geronimo/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml
geronimo/yoko/trunk/maven-plugins/pom.xml
geronimo/yoko/trunk/pom.xml
geronimo/yoko/trunk/rmi-impl/pom.xml
geronimo/yoko/trunk/rmi-spec/pom.xml
geronimo/yoko/trunk/yoko-spec-corba/pom.xml
Modified: geronimo/yoko/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/NOTICE?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/NOTICE (original)
+++ geronimo/yoko/trunk/NOTICE Tue Jan 15 07:13:56 2008
@@ -11,45 +11,5 @@
The RMI over IIOP implementation were developed at Trifork Technologies.
- Command line tools and the corba binding infrastructure is provided by
- the celtix package, which is open source software, written at ObjectWeb
- open source Consortium. The original software is available from
- http://forge.objectweb.org/project/showfiles.php?group_id=192
-
- IDL parser and the IDL grammar file used by the idltowsdl tool
- are provided by the antlr package, which is available under a BSD license.
- The original software is available from
- http://www.antlr.org/download.html
-
- XMLSchema apache project is used by the tools & corba binding
- runtime to parse the schema used in the wsdl. This project is
- developed at the apache software foundation.
- The original software is available from
- http://www.apache.org/dyn/closer.cgi/ws/commons/XmlSchema
-
- Wsdl4j (The Web Services Description Language for Java Toolkit)
- is the reference implementation for JSR110 'JWSDL'. It is open
- source software and developed at Sourceforge. It is used by the
- tools to represent the WSDL documents. The original software is
- available from
- http://sourceforge.net/projects/wsdl4j
-
- SAAJ The SOAP with Attachments API for Java (SAAJ) provides a
- standard way to send XML documents over the Internet from
- the Java platform. The SAAJ specification is developed through
- the Java Community Process and the Expert Group lead is Sun
- MicroSystems Inc. The original software is availabe from
- http://saaj.dev.java.net/
-
- JSR 181 Web Services Metadata for the Java Platform. This specification
- is developed through the Java Community Process. The original software
- is available as part of the project glassfish
- https://glassfish.dev.java.net/
-
- JSR 250 Common Annotations for the JavaTM Platform.
- This specification is developed through the Java
- Community Process. The original software is available
- as part of the project glassfish
- https://glassfish.dev.java.net/
Modified: geronimo/yoko/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/pom.xml (original)
+++ geronimo/yoko/trunk/core/pom.xml Tue Jan 15 07:13:56 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: geronimo/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/pom.xml (original)
+++ geronimo/yoko/trunk/distribution/pom.xml Tue Jan 15 07:13:56 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: geronimo/yoko/trunk/distribution/src/main/samples/orb/hello_world/build.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/src/main/samples/orb/hello_world/build.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/src/main/samples/orb/hello_world/build.xml (original)
+++ geronimo/yoko/trunk/distribution/src/main/samples/orb/hello_world/build.xml Tue Jan 15 07:13:56 2008
@@ -41,7 +41,7 @@
<src path="${basedir}/src"/>
<src path="${build.src.dir}"/>
<classpath>
- <path path="${yoko.home}/lib/yoko-core-1.0-incubating-SNAPSHOT.jar"/>
+ <path path="${yoko.home}/lib/yoko-core-1.0-SNAPSHOT.jar"/>
</classpath>
</javac>
</target>
Modified: geronimo/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml (original)
+++ geronimo/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml Tue Jan 15 07:13:56 2008
@@ -34,7 +34,7 @@
<path id="yoko.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${yoko.home}/lib/yoko-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${yoko.home}/lib/yoko-1.0-SNAPSHOT.jar"/>
</path>
<target name="build" depends="generate.server.code, generate.client.code">
Modified: geronimo/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/build.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/build.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/build.xml (original)
+++ geronimo/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/build.xml Tue Jan 15 07:13:56 2008
@@ -34,7 +34,7 @@
<path id="yoko.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${yoko.home}/lib/yoko-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${yoko.home}/lib/yoko-1.0-SNAPSHOT.jar"/>
</path>
<target name="build">
Modified: geronimo/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml (original)
+++ geronimo/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml Tue Jan 15 07:13:56 2008
@@ -34,7 +34,7 @@
<path id="yoko.classpath">
<pathelement location="${build.classes.dir}"/>
- <pathelement location="${yoko.home}/lib/yoko-1.0-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${yoko.home}/lib/yoko-1.0-SNAPSHOT.jar"/>
</path>
<target name="build" depends="generate.server.code, generate.client.code, generate.idl.server.code, generate.idl.client.code">
@@ -50,7 +50,7 @@
<src path="${basedir}/src"/>
<src path="${build.src.dir}"/>
<classpath>
- <path path="${yoko.home}/core/target/yoko-core-1.0-incubating-SNAPSHOT.jar"/>
+ <path path="${yoko.home}/core/target/yoko-core-1.0-SNAPSHOT.jar"/>
</classpath>
</javac>
</target>
Modified: geronimo/yoko/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/maven-plugins/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/maven-plugins/pom.xml (original)
+++ geronimo/yoko/trunk/maven-plugins/pom.xml Tue Jan 15 07:13:56 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Tue Jan 15 07:13:56 2008
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Apache Yoko CORBA Server</name>
<url>http://incubator.apache.org/yoko/</url>
<inceptionYear>2006</inceptionYear>
@@ -41,8 +41,6 @@
<module>yoko-spec-corba</module>
<module>rmi-spec</module>
<module>rmi-impl</module>
- <module>api</module>
- <module>bindings</module>
</modules>
<!-- These properties should be defined in top level pom.xml -->
@@ -55,22 +53,16 @@
element, and it will need to be changed manually before a release,
as the maven-release-plugin will not update this value.
-->
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<!-- versions of external dependencies -->
<ant.version>1.6.5</ant.version>
<antrun.version>1.1</antrun.version>
<antlr.version>2.7.5</antlr.version>
<bcel.version>5.2</bcel.version>
- <cxf.version>2.0-incubator</cxf.version>
- <commons.logging.version>1.0.4</commons.logging.version>
- <commons.codec.version>1.3</commons.codec.version>
<concurrent.version>1.3.4</concurrent.version>
<junit.version>3.8.2</junit.version>
<maven.version>2.0.1</maven.version>
- <xmlschema.version>1.2</xmlschema.version>
- <stax.version>3.2.1</stax.version>
-
<compiler.version>2.0.2</compiler.version>
<eclipse.version>2.3</eclipse.version>
<javadoc.version>2.2</javadoc.version>
@@ -84,9 +76,6 @@
<no.checkstyle>false</no.checkstyle>
<no.pmd>false</no.pmd>
<notice.dir>.</notice.dir>
- <jaxb.version>2.0</jaxb.version>
- <jaxb.impl.version>2.0.3</jaxb.impl.version>
- <jaxws.version>2.0</jaxws.version>
</properties>
<dependencyManagement>
@@ -104,21 +93,6 @@
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
- <artifactId>yoko-api</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-tools</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-bindings</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
<version>${version}</version>
</dependency>
@@ -129,64 +103,6 @@
</dependency>
<!-- External dependencies -->
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.impl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>${jaxb.impl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -197,61 +113,6 @@
<version>${bcel.version}</version>
</dependency>
<dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>${antlr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${xmlschema.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>${stax.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-validator</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-wsdl2java</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
@@ -277,16 +138,6 @@
<version>${concurrent.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -450,21 +301,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -479,12 +315,10 @@
<downloadSources>true</downloadSources>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
- <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
<java.lang.String>net.sourceforge.pmd.eclipse.pmdBuilder</java.lang.String>
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
<nature>net.sourceforge.pmd.eclipse.pmdNature</nature>
</projectnatures>
</configuration>
@@ -594,26 +428,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>full</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>tools</module>
- <module>maven-plugins</module>
- <module>distribution</module>
- </modules>
- </profile>
-
- <profile>
- <id>runtime</id>
- <modules>
- <module>distribution</module>
- </modules>
- </profile>
-
<profile>
<id>release</id>
Modified: geronimo/yoko/trunk/rmi-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/rmi-impl/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/rmi-impl/pom.xml (original)
+++ geronimo/yoko/trunk/rmi-impl/pom.xml Tue Jan 15 07:13:56 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>yoko-rmi-impl</artifactId>
<packaging>jar</packaging>
Modified: geronimo/yoko/trunk/rmi-spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/rmi-spec/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/rmi-spec/pom.xml (original)
+++ geronimo/yoko/trunk/rmi-spec/pom.xml Tue Jan 15 07:13:56 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>yoko-rmi-spec</artifactId>
<packaging>jar</packaging>
Modified: geronimo/yoko/trunk/yoko-spec-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-spec-corba/pom.xml?rev=612133&r1=612132&r2=612133&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-spec-corba/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-spec-corba/pom.xml Tue Jan 15 07:13:56 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>yoko-spec-corba</artifactId>
<packaging>jar</packaging>