You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/04/23 01:46:17 UTC
svn commit: r937109 - in /geronimo/yoko/trunk: ./ yoko-core/
yoko-core/src/main/appended-resources/
yoko-core/src/main/appended-resources/META-INF/ yoko-osgi/ yoko-rmi-impl/
yoko-rmi-impl/src/main/appended-resources/
yoko-rmi-impl/src/main/appended-res...
Author: djencks
Date: Thu Apr 22 23:46:16 2010
New Revision: 937109
URL: http://svn.apache.org/viewvc?rev=937109&view=rev
Log:
fix up generate LICENSE/NOTICE files, add license to readme
Added:
geronimo/yoko/trunk/yoko-core/src/main/appended-resources/
geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/
geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/LICENSE.vm
geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/NOTICE.vm
geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/
geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/
geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/LICENSE.vm
geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/NOTICE.vm
geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/
geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/
geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/LICENSE.vm
geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/NOTICE.vm
geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/
geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/
geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/LICENSE.vm
geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/NOTICE.vm
Removed:
geronimo/yoko/trunk/yoko-core/LICENSE
geronimo/yoko/trunk/yoko-core/NOTICE
geronimo/yoko/trunk/yoko-rmi-impl/LICENSE
geronimo/yoko/trunk/yoko-rmi-impl/NOTICE
geronimo/yoko/trunk/yoko-rmi-spec/LICENSE
geronimo/yoko/trunk/yoko-rmi-spec/NOTICE
geronimo/yoko/trunk/yoko-spec-corba/LICENSE
geronimo/yoko/trunk/yoko-spec-corba/NOTICE
Modified:
geronimo/yoko/trunk/README.txt
geronimo/yoko/trunk/pom.xml
geronimo/yoko/trunk/yoko-osgi/pom.xml
Modified: geronimo/yoko/trunk/README.txt
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/README.txt?rev=937109&r1=937108&r2=937109&view=diff
==============================================================================
--- geronimo/yoko/trunk/README.txt (original)
+++ geronimo/yoko/trunk/README.txt Thu Apr 22 23:46:16 2010
@@ -1,22 +1,30 @@
- Instructions to build Yoko
- ============================
+* 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.
+
+ Instructions to build Apache Yoko
+ ===================================
Build Requirements
------------------
-1. maven2.0.2 and above as your MAVEN_HOME
-2. JDK1.5 as your JAVA_HOME
-3. Subversion 1.2 and above
+1. maven 2.2.1 or above
+2. JDK1.5 or above
Steps to build Yoko
-------------------
-1. If you aren't using maven first time then we recommend cleaning local maven repository.
- on unix clean: ~/.m2/ directory
- on win clean: %USERPROFILE%/m2/ directory
-
-2. Open a shell and add JAVA_HOME and MAVEN_HOME environment variables to your path.
-
-3. Run the command 'mvn install'.
+1. Configure maven so it works in your system.
-4. To do a clean build run 'mvn clean install'
+2. Run the command 'mvn install' or 'mvn clean install'.
Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=937109&r1=937108&r2=937109&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Thu Apr 22 23:46:16 2010
@@ -230,24 +230,24 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>**/*$*</exclude>
- </excludes>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <forkMode>once</forkMode>
- <childDelegation>false</childDelegation>
- <argLine>-ea</argLine>
- </configuration>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<includes>-->
+ <!--<include>**/*Test.java</include>-->
+ <!--<include>**/*TestCase.java</include>-->
+ <!--</includes>-->
+ <!--<excludes>-->
+ <!--<exclude>**/*$*</exclude>-->
+ <!--</excludes>-->
+ <!--<reportFormat>brief</reportFormat>-->
+ <!--<useFile>false</useFile>-->
+ <!--<forkMode>once</forkMode>-->
+ <!--<childDelegation>false</childDelegation>-->
+ <!--<argLine>-ea</argLine>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Added: geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/LICENSE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,13 @@
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+ for the idl.g component:
+
+ Object Management Group (OMG) classes
+
+ /***** Copyright (c) 1999 Object Management Group. Unlimited rights to
+ duplicate and use this code are hereby granted provided that this
+ copyright notice is included.
+ *****/
+
Added: geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/NOTICE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/yoko/trunk/yoko-core/src/main/appended-resources/META-INF/NOTICE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,10 @@
+
+ ORB Portions of this software were developed at IONA Technologies.
+
+ Object Management Group (OMG) classes used by the orb.
+ The original classes are available from www.org.omg.
+
+ The RMI over IIOP implementation were developed at Trifork Technologies.
+
+
+
Modified: geronimo/yoko/trunk/yoko-osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-osgi/pom.xml?rev=937109&r1=937108&r2=937109&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-osgi/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-osgi/pom.xml Thu Apr 22 23:46:16 2010
@@ -25,7 +25,7 @@
<version>1.1-SNAPSHOT</version>
</parent>
<artifactId>yoko-osgi</artifactId>
- <name>Apache Yoko osgi support</name>
+ <name>Apache Yoko OSGI Support</name>
<packaging>bundle</packaging>
<dependencies>
<!-- this contains the osgi-relevant classes in the endorsed dir -->
Added: geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/LICENSE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,13 @@
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+ for the idl.g component:
+
+ Object Management Group (OMG) classes
+
+ /***** Copyright (c) 1999 Object Management Group. Unlimited rights to
+ duplicate and use this code are hereby granted provided that this
+ copyright notice is included.
+ *****/
+
Added: geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/NOTICE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/yoko/trunk/yoko-rmi-impl/src/main/appended-resources/META-INF/NOTICE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,10 @@
+
+ ORB Portions of this software were developed at IONA Technologies.
+
+ Object Management Group (OMG) classes used by the orb.
+ The original classes are available from www.org.omg.
+
+ The RMI over IIOP implementation were developed at Trifork Technologies.
+
+
+
Added: geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/LICENSE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,13 @@
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+ for the idl.g component:
+
+ Object Management Group (OMG) classes
+
+ /***** Copyright (c) 1999 Object Management Group. Unlimited rights to
+ duplicate and use this code are hereby granted provided that this
+ copyright notice is included.
+ *****/
+
Added: geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/NOTICE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/yoko/trunk/yoko-rmi-spec/src/main/appended-resources/META-INF/NOTICE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,10 @@
+
+ ORB Portions of this software were developed at IONA Technologies.
+
+ Object Management Group (OMG) classes used by the orb.
+ The original classes are available from www.org.omg.
+
+ The RMI over IIOP implementation were developed at Trifork Technologies.
+
+
+
Added: geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/LICENSE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,13 @@
+
+ THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+ FOLLOWING LICENSES:
+
+ for the idl.g component:
+
+ Object Management Group (OMG) classes
+
+ /***** Copyright (c) 1999 Object Management Group. Unlimited rights to
+ duplicate and use this code are hereby granted provided that this
+ copyright notice is included.
+ *****/
+
Added: geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/NOTICE.vm?rev=937109&view=auto
==============================================================================
--- geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/NOTICE.vm (added)
+++ geronimo/yoko/trunk/yoko-spec-corba/src/main/appended-resources/META-INF/NOTICE.vm Thu Apr 22 23:46:16 2010
@@ -0,0 +1,10 @@
+
+ ORB Portions of this software were developed at IONA Technologies.
+
+ Object Management Group (OMG) classes used by the orb.
+ The original classes are available from www.org.omg.
+
+ The RMI over IIOP implementation were developed at Trifork Technologies.
+
+
+