You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/02/26 14:57:57 UTC

svn commit: r511837 - in /incubator/yoko/trunk: ./ bindings/src/main/resources/META-INF/ core/ distribution/ rmi-impl/ rmi-spec/ yoko-spec-corba/

Author: bravi
Date: Mon Feb 26 06:57:56 2007
New Revision: 511837

URL: http://svn.apache.org/viewvc?view=rev&rev=511837
Log:
[YOKO-297] - Created a separate assembly for the runtime modules.

Added:
    incubator/yoko/trunk/distribution/assembly-runtime-bin.xml   (with props)
Modified:
    incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
    incubator/yoko/trunk/core/LICENSE
    incubator/yoko/trunk/core/NOTICE
    incubator/yoko/trunk/distribution/pom.xml
    incubator/yoko/trunk/pom.xml
    incubator/yoko/trunk/rmi-impl/LICENSE
    incubator/yoko/trunk/rmi-impl/NOTICE
    incubator/yoko/trunk/rmi-spec/LICENSE
    incubator/yoko/trunk/rmi-spec/NOTICE
    incubator/yoko/trunk/yoko-spec-corba/LICENSE
    incubator/yoko/trunk/yoko-spec-corba/NOTICE
    incubator/yoko/trunk/yoko-spec-corba/pom.xml

Modified: incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml (original)
+++ incubator/yoko/trunk/bindings/src/main/resources/META-INF/extensions.xml Mon Feb 26 06:57:56 2007
@@ -23,4 +23,5 @@
     <entry key="org.apache.yoko.bindings.corba-2">javax.wsdl.BindingOperation=org.apache.schemas.yoko.bindings.corba.OperationType</entry>
     <entry key="org.apache.yoko.bindings.corba-3">javax.wsdl.Definition=org.apache.schemas.yoko.bindings.corba.TypeMappingType</entry>
     <entry key="org.apache.yoko.bindings.corba-4">javax.wsdl.Port=org.apache.schemas.yoko.bindings.corba.AddressType</entry>
+    <entry key="org.apache.yoko.bindings.corba-5">javax.wsdl.Port=org.apache.schemas.yoko.bindings.corba.PolicyType</entry>
 </properties>

Modified: incubator/yoko/trunk/core/LICENSE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/LICENSE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/core/LICENSE (original)
+++ incubator/yoko/trunk/core/LICENSE Mon Feb 26 06:57:56 2007
@@ -204,46 +204,7 @@
    THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
    FOLLOWING LICENSES:
  
-   for the idl.g component:
 
-   ANTLR 2 License
-
-   We reserve no legal rights to the ANTLR--it is fully in the public domain. 
-   An individual or company may do whatever they wish with source code distributed 
-   with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, 
-   or its output, into commerical software. 
-
-   We encourage users to develop software with ANTLR. However, we do ask that credit
-   is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR 
-   or incorporate any source code into one of your programs (commercial product, 
-   research project, or otherwise) that you acknowledge this fact somewhere in 
-   the documentation, research report, etc... If you like ANTLR and have developed 
-   a nice tool with the output, please mention that you developed it using ANTLR. 
-   In addition, we ask that the headers remain intact in our source code. As long 
-   as these guidelines are kept, we expect to continue enhancing this system and 
-   expect to make other tools available as they are completed. 
- 
-   Celtix, EPL License,
-   	../etc/third_party_licenses/celtix-epl-license.txt
- 
-   Antlr, BSD License,
-	../etc/third_party_licenses/antlr-bsd-license.txt
- 
-   XmlSchema, Apache License,
-	../etc/third_party_licenses/apache-license.txt
- 
-   WSDL4j, Common Public License,
-	../etc/third_party_licenses/wsdl4j-cpl-license.txt
- 
-   Saaj, CDDL License
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR150, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR181, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
-	
 	 Object Management Group (OMG) classes  
 		
 		/***** Copyright (c) 1999 Object Management Group. Unlimited rights to

Modified: incubator/yoko/trunk/core/NOTICE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/NOTICE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/core/NOTICE (original)
+++ incubator/yoko/trunk/core/NOTICE Mon Feb 26 06:57:56 2007
@@ -11,45 +11,3 @@
 
    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/
-   
-

Added: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/assembly-runtime-bin.xml?view=auto&rev=511837
==============================================================================
--- incubator/yoko/trunk/distribution/assembly-runtime-bin.xml (added)
+++ incubator/yoko/trunk/distribution/assembly-runtime-bin.xml Mon Feb 26 06:57:56 2007
@@ -0,0 +1,74 @@
+<?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.
+-->
+<assembly>
+  <id>runtime-bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>../yoko-spec-corba</directory>
+      <outputDirectory>yoko-incubating-runtime-bin-1.0-M2</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>DISCLAIMER*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+        <directory>src/main/bin</directory>
+        <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/bin</outputDirectory>
+        <fileMode>775</fileMode>
+    </fileSet>
+    <fileSet>
+        <directory>../etc/third_party_licenses</directory>
+        <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/etc/third_party_licenses</outputDirectory>
+        <includes>
+            <include>apache*.txt</include>
+        </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
+      <includes>
+        <include>yoko-${version}.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+      <dependencySet>
+          <outputDirectory>yoko-incubating-runtime-bin-1.0-M2/lib</outputDirectory>
+          <outputFileNameMapping>${artifactId}-${baseVersion}.${extension}</outputFileNameMapping>
+          <unpack>false</unpack>
+          <scope>runtime</scope>
+          <includes>
+              <include>org.apache.yoko:yoko-core:jar</include>
+              <include>org.apache.yoko:yoko-rmi-spec:jar</include>
+              <include>org.apache.yoko:yoko-spec-corba:jar</include>
+              <include>org.apache.yoko:yoko-rmi-impl:jar</include>
+              <include>org.apache.bcel:bcel:jar</include>
+              <include>jakarta-regexp:jakarta-regexp:jar</include>
+          </includes>
+      </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

Propchange: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/yoko/trunk/distribution/assembly-runtime-bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Mon Feb 26 06:57:56 2007
@@ -45,6 +45,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-rmi-impl</artifactId>
+        </dependency>
+        <!-- moved to the profile for M2 release
+        Use the profile runtime for just the runtime pieces
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-tools</artifactId>
         </dependency>
         <dependency>
@@ -56,10 +62,13 @@
             <artifactId>cxf-tools-wsdl2java</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        -->
     </dependencies>
 
     <build>
         <plugins>
+            <!-- moved to the profile for M2 release
+            Use the profile runtime for just the runtime pieces
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -118,7 +127,7 @@
                     </execution>
                 </executions>
             </plugin>
-
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -141,4 +150,135 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>full</id>
+            <activation>
+               <activeByDefault>true</activeByDefault>
+            </activation>
+           <dependencies>
+               <dependency>
+                   <groupId>org.apache.yoko</groupId>
+                   <artifactId>yoko-core</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.apache.yoko</groupId>
+                   <artifactId>yoko-tools</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.apache.yoko</groupId>
+                   <artifactId>yoko-bindings</artifactId>
+               </dependency>
+               <dependency>
+                   <groupId>org.apache.cxf</groupId>
+                   <artifactId>cxf-tools-wsdl2java</artifactId>
+                   <version>${cxf.version}</version>
+               </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <id>distribution-src-epl</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <archive>
+                                        <manifest>
+                                            <mainClass>yokoinstaller.Installer</mainClass> 
+                                        </manifest>                               
+                                        <manifestEntries>                                    
+                                            <Specification-Title>${yoko.name}</Specification-Title>
+                                            <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+                                            <Specification-Version>${version}</Specification-Version>
+                                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                            <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                                        </manifestEntries>                                
+                                    </archive>
+                                    <descriptors>
+                                        <descriptor>assembly-bin.xml</descriptor>
+                                        <descriptor>assembly-src.xml</descriptor>
+                                        <descriptor>assembly-runtime-bin.xml</descriptor>
+                                    </descriptors>
+                                    <finalName>yoko-${version}</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>dependency-maven-plugin</artifactId>
+                        <version>1.0</version>
+                        <executions>
+                            <execution>
+                                <id>unpack-javadoc</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.apache.yoko</groupId>
+                                            <artifactId>yoko-api</artifactId>
+                                            <version>${version}</version>
+                                            <classifier>javadoc</classifier>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                              </execution>
+                         </executions>
+                     </plugin>
+                 </plugins>
+            </build>         
+        </profile>
+
+        <profile>
+            <id>runtime</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.1</version>
+                        <executions>
+                            <execution>
+                                <id>distribution-src-epl</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <archive>
+                                        <manifest>
+                                            <mainClass>yokoinstaller.Installer</mainClass> 
+                                        </manifest>                               
+                                        <manifestEntries>                                    
+                                             <Specification-Title>${yoko.name}</Specification-Title>
+                                             <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+                                             <Specification-Version>${version}</Specification-Version>
+                                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                            <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                                        </manifestEntries>                                
+                                    </archive>
+                                    <descriptors>
+                                        <descriptor>assembly-runtime-bin.xml</descriptor>
+                                        <descriptor>assembly-src.xml</descriptor>
+                                    </descriptors>
+                                    <finalName>yoko-${version}</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>            
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Mon Feb 26 06:57:56 2007
@@ -33,11 +33,14 @@
         <module>yoko-spec-corba</module>
         <module>rmi-spec</module>
         <module>rmi-impl</module>
+        <!-- moved to the profile for M2 release
+        Use the profile runtime for just the runtime pieces
         <module>api</module>
         <module>tools</module>
         <module>maven-plugins</module>
         <module>bindings</module>
         <module>distribution</module>
+        -->
         <!-- These are not ready yet
         <module>system_tests</module>
         -->
@@ -67,16 +70,15 @@
         <maven.version>2.0.1</maven.version>
         <xmlschema.version>1.1</xmlschema.version>
 
-        <compiler.version>2.0.1</compiler.version>
-        <eclipse.version>2.3-SNAPSHOT</eclipse.version>
-        <javadoc.version>2.0-beta-3</javadoc.version>
-        <jar.version>2.0</jar.version>
+        <compiler.version>2.0.2</compiler.version>
+        <eclipse.version>2.3</eclipse.version>
+        <javadoc.version>2.2</javadoc.version>
+        <jar.version>2.1</jar.version>
         <java.source.version>1.5</java.source.version>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
         <java.endorsed.dirs>${basedir}/target/classes</java.endorsed.dirs>
         <site.version>2.0-beta-4</site.version>
         <compile.forked>false</compile.forked>
-        <java.source.version>1.5</java.source.version>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
         <topDirectoryLocation>.</topDirectoryLocation>
         <no.checkstyle>false</no.checkstyle>
@@ -365,7 +367,7 @@
                     <goal>deploy-maven-one-repository</goal>
                   </goals>
                   <configuration>
-                    <remoteRepositoryId>apache-snapshot-repository</remoteRepositoryId>
+                    <remoteRepositoryId>apache-snapshots</remoteRepositoryId>
                     <remoteRepositoryUrl>scpexe://people.apache.org/www/people.apache.org/repository</remoteRepositoryUrl>
                   </configuration>
                 </execution>
@@ -414,7 +416,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-1-SNAPSHOT</version>
+                    <version>2.0-alpha-1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -486,7 +488,7 @@
 
   <repositories>
       <repository>
-          <id>apache-snapshot-repository</id>
+          <id>apache-snapshots</id>
           <name>Apache repo</name>
           <url>http://people.apache.org/maven-snapshot-repository</url>
           <releases>
@@ -497,7 +499,7 @@
           </snapshots>
       </repository>
       <repository>
-          <id>apache-incubating-repository</id>
+          <id>apache-incubator</id>
           <name>Apache incubating repo</name>
           <url>http://people.apache.org/repo/m2-incubating-repository</url>
       </repository>
@@ -511,7 +513,7 @@
 
   <pluginRepositories>
         <pluginRepository>
-          <id>apache-incubating-repository</id>
+          <id>apache-incubator</id>
           <name>Apache incubating repo</name>
           <url>http://people.apache.org/repo/m2-incubating-repository</url>
           <layout>default</layout>
@@ -541,7 +543,7 @@
          </releases>
        </pluginRepository>
         <pluginRepository>
-            <id>apache-snapshot-repository</id>
+            <id>apache-snapshots</id>
             <name>Maven apache plugins snapshot repository</name>
             <url>http://people.apache.org/maven-snapshot-repository</url>
             <layout>default</layout>
@@ -556,7 +558,7 @@
 
   <distributionManagement>
     <snapshotRepository>
-       <id>apache-snapshot-repository</id>
+       <id>apache-snapshots</id>
        <name>Apache SNAPSHOT Repository</name>
        <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
     </snapshotRepository>
@@ -594,6 +596,27 @@
           </plugins>
         </build>
     </profile>
+
+    <profile>
+        <id>full</id>
+        <activation>
+           <activeByDefault>true</activeByDefault>
+        </activation>
+        <modules>
+            <module>api</module>
+            <module>tools</module>
+            <module>maven-plugins</module>
+            <module>bindings</module>
+            <module>distribution</module>
+        </modules>
+     </profile>
+
+    <profile>
+        <id>runtime</id>
+        <modules>
+            <module>distribution</module>
+        </modules>
+     </profile>
   </profiles>
 
 </project>

Modified: incubator/yoko/trunk/rmi-impl/LICENSE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-impl/LICENSE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/rmi-impl/LICENSE (original)
+++ incubator/yoko/trunk/rmi-impl/LICENSE Mon Feb 26 06:57:56 2007
@@ -204,46 +204,7 @@
    THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
    FOLLOWING LICENSES:
  
-   for the idl.g component:
 
-   ANTLR 2 License
-
-   We reserve no legal rights to the ANTLR--it is fully in the public domain. 
-   An individual or company may do whatever they wish with source code distributed 
-   with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, 
-   or its output, into commerical software. 
-
-   We encourage users to develop software with ANTLR. However, we do ask that credit
-   is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR 
-   or incorporate any source code into one of your programs (commercial product, 
-   research project, or otherwise) that you acknowledge this fact somewhere in 
-   the documentation, research report, etc... If you like ANTLR and have developed 
-   a nice tool with the output, please mention that you developed it using ANTLR. 
-   In addition, we ask that the headers remain intact in our source code. As long 
-   as these guidelines are kept, we expect to continue enhancing this system and 
-   expect to make other tools available as they are completed. 
- 
-   Celtix, EPL License,
-   	../etc/third_party_licenses/celtix-epl-license.txt
- 
-   Antlr, BSD License,
-	../etc/third_party_licenses/antlr-bsd-license.txt
- 
-   XmlSchema, Apache License,
-	../etc/third_party_licenses/apache-license.txt
- 
-   WSDL4j, Common Public License,
-	../etc/third_party_licenses/wsdl4j-cpl-license.txt
- 
-   Saaj, CDDL License
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR150, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR181, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
-	
 	 Object Management Group (OMG) classes  
 		
 		/***** Copyright (c) 1999 Object Management Group. Unlimited rights to

Modified: incubator/yoko/trunk/rmi-impl/NOTICE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-impl/NOTICE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/rmi-impl/NOTICE (original)
+++ incubator/yoko/trunk/rmi-impl/NOTICE Mon Feb 26 06:57:56 2007
@@ -11,45 +11,3 @@
 
    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: incubator/yoko/trunk/rmi-spec/LICENSE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-spec/LICENSE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/rmi-spec/LICENSE (original)
+++ incubator/yoko/trunk/rmi-spec/LICENSE Mon Feb 26 06:57:56 2007
@@ -204,46 +204,7 @@
    THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
    FOLLOWING LICENSES:
  
-   for the idl.g component:
 
-   ANTLR 2 License
-
-   We reserve no legal rights to the ANTLR--it is fully in the public domain. 
-   An individual or company may do whatever they wish with source code distributed 
-   with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, 
-   or its output, into commerical software. 
-
-   We encourage users to develop software with ANTLR. However, we do ask that credit
-   is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR 
-   or incorporate any source code into one of your programs (commercial product, 
-   research project, or otherwise) that you acknowledge this fact somewhere in 
-   the documentation, research report, etc... If you like ANTLR and have developed 
-   a nice tool with the output, please mention that you developed it using ANTLR. 
-   In addition, we ask that the headers remain intact in our source code. As long 
-   as these guidelines are kept, we expect to continue enhancing this system and 
-   expect to make other tools available as they are completed. 
- 
-   Celtix, EPL License,
-   	../etc/third_party_licenses/celtix-epl-license.txt
- 
-   Antlr, BSD License,
-	../etc/third_party_licenses/antlr-bsd-license.txt
- 
-   XmlSchema, Apache License,
-	../etc/third_party_licenses/apache-license.txt
- 
-   WSDL4j, Common Public License,
-	../etc/third_party_licenses/wsdl4j-cpl-license.txt
- 
-   Saaj, CDDL License
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR150, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR181, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
-	
 	 Object Management Group (OMG) classes  
 		
 		/***** Copyright (c) 1999 Object Management Group. Unlimited rights to

Modified: incubator/yoko/trunk/rmi-spec/NOTICE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi-spec/NOTICE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/rmi-spec/NOTICE (original)
+++ incubator/yoko/trunk/rmi-spec/NOTICE Mon Feb 26 06:57:56 2007
@@ -11,45 +11,3 @@
 
    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: incubator/yoko/trunk/yoko-spec-corba/LICENSE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/LICENSE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/LICENSE (original)
+++ incubator/yoko/trunk/yoko-spec-corba/LICENSE Mon Feb 26 06:57:56 2007
@@ -204,46 +204,7 @@
    THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
    FOLLOWING LICENSES:
  
-   for the idl.g component:
 
-   ANTLR 2 License
-
-   We reserve no legal rights to the ANTLR--it is fully in the public domain. 
-   An individual or company may do whatever they wish with source code distributed 
-   with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR, 
-   or its output, into commerical software. 
-
-   We encourage users to develop software with ANTLR. However, we do ask that credit
-   is given to us for developing ANTLR. By "credit", we mean that if you use ANTLR 
-   or incorporate any source code into one of your programs (commercial product, 
-   research project, or otherwise) that you acknowledge this fact somewhere in 
-   the documentation, research report, etc... If you like ANTLR and have developed 
-   a nice tool with the output, please mention that you developed it using ANTLR. 
-   In addition, we ask that the headers remain intact in our source code. As long 
-   as these guidelines are kept, we expect to continue enhancing this system and 
-   expect to make other tools available as they are completed. 
- 
-   Celtix, EPL License,
-   	../etc/third_party_licenses/celtix-epl-license.txt
- 
-   Antlr, BSD License,
-	../etc/third_party_licenses/antlr-bsd-license.txt
- 
-   XmlSchema, Apache License,
-	../etc/third_party_licenses/apache-license.txt
- 
-   WSDL4j, Common Public License,
-	../etc/third_party_licenses/wsdl4j-cpl-license.txt
- 
-   Saaj, CDDL License
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR150, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
- 
-   JSR181, CDDL License,
-	../etc/third_party_licenses/CDDL-license.txt
-	
 	 Object Management Group (OMG) classes  
 		
 		/***** Copyright (c) 1999 Object Management Group. Unlimited rights to

Modified: incubator/yoko/trunk/yoko-spec-corba/NOTICE
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/NOTICE?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/NOTICE (original)
+++ incubator/yoko/trunk/yoko-spec-corba/NOTICE Mon Feb 26 06:57:56 2007
@@ -11,45 +11,3 @@
 
    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: incubator/yoko/trunk/yoko-spec-corba/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/yoko-spec-corba/pom.xml?view=diff&rev=511837&r1=511836&r2=511837
==============================================================================
--- incubator/yoko/trunk/yoko-spec-corba/pom.xml (original)
+++ incubator/yoko/trunk/yoko-spec-corba/pom.xml Mon Feb 26 06:57:56 2007
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>idlj-maven-plugin</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>