You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/20 22:19:42 UTC

svn commit: r736108 - in /incubator/openwebbeans/trunk: NOTICE.txt README.txt pom.xml

Author: gerdogdu
Date: Tue Jan 20 13:19:41 2009
New Revision: 736108

URL: http://svn.apache.org/viewvc?rev=736108&view=rev
Log:
Updating the some artifacts before the M1-Release

Modified:
    incubator/openwebbeans/trunk/NOTICE.txt
    incubator/openwebbeans/trunk/README.txt
    incubator/openwebbeans/trunk/pom.xml

Modified: incubator/openwebbeans/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/NOTICE.txt?rev=736108&r1=736107&r2=736108&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/NOTICE.txt (original)
+++ incubator/openwebbeans/trunk/NOTICE.txt Tue Jan 20 13:19:41 2009
@@ -2,30 +2,77 @@
 ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
 ==  Version 2.0, in this case for the OpenWebBeans                     ==
 =========================================================================
+Apache OpenWebBeans
+Copyright 2008, 2009 The Apache Software Foundation
 
 This product includes software developed by 
 The Apache Software Foundation (http://www.apache.org/).
 
-This product uses junit-4.5.jar as binary, home page of the project is
-http://sourceforge.net/projects/junit/ with Common Public License 1.0.
+=========================================================================
+==  Junit Notice                                        	       ==
+=========================================================================
+
+This product includes/uses test library junit-4.5.jar as binary, 
+home page of the project is http://sourceforge.net/projects/junit/ 
+LICENCE : Common Public License 1.0.
 
+=========================================================================
+==  Dom4j Notice                                        	       ==
+=========================================================================
 This products uses dom4j-1.6.1.jar as binary, home page of the project is
 http://www.dom4j.org/ with dom4j BSD Style licence.
 
-This product uses javassist-3.8.0.GA as binary, home page of the project is
-http://www.jboss.org/javassist/ with MPL licence.
+ Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document.
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+   3. The name "DOM4J" must not be used to endorse or promote products derived from this Software without prior written permission of MetaStuff, Ltd. For written permission, please contact dom4j-info@metastuff.com.
+   4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark of MetaStuff, Ltd.
+   5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
 
-This product uses scannotation-1.0.2.jar as binary, home page of the project is
-http://sourceforge.net/projects/scannotation with Apache License V2.0 licence.
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-This product uses jsr250-api-1.0.jar as binary, home page of the project is
-https://jsr250.dev.java.net/. with Common Development and Distribution License.
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. 
 
-This product uses the some Java EE API jars developed by the Apache Geronimo project. 
-The project home page is http://geronimo.apache.org/
+=========================================================================
+==  Javassist Notice                                        	       ==
+=========================================================================
+
+This product includes/uses byte code library javassist-3.8.0.GA as binary, 
+home page of the project is http://www.jboss.org/javassist/
+LICENCE : MPL licence.
+
+=========================================================================
+==  Scannotation Notice                                        	       ==
+=========================================================================
+This product includes/uses scannotation-1.0.2.jar as binary, 
+home page of the project is http://sourceforge.net/projects/scannotation.
+LICENCE : Apache License V2.0 licence.
 
-This product uses the some JSF API jars developed by the Apache MyFaces project. 
-The project home page is http://myfaces.apache.org/
+=========================================================================
+==  Sun CDDL Notice                                                    ==
+=========================================================================
+This product includes software developed for the JSR-250 Reference 
+Implementation project. (https://jsr250.dev.java.net/)
+LICENCE: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0  (http://www.sun.com/cddl/cddl.html)
+
+=========================================================================
+==  Apache GERONIMO Notice                                             ==
+=========================================================================
+
+Apache Geronimo 
+Copyright 2003-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+=========================================================================
+==  Apache MyFaces Notice                                              ==
+=========================================================================
+This product includes software developed by:
+The Apache Software Foundation (http://www.apache.org/)
 
-See the LICENSE.txt file and licences folder for information on all licenses 
+-------------------------------------------------------------------------------
+See the LICENSE.txt file and /licences folder for information on all licenses 
 associated with this software.
+-------------------------------------------------------------------------------

Modified: incubator/openwebbeans/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/README.txt?rev=736108&r1=736107&r2=736108&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/README.txt (original)
+++ incubator/openwebbeans/trunk/README.txt Tue Jan 20 13:19:41 2009
@@ -39,8 +39,8 @@
 
 There are two important jars for OpenWebBeans;
 
- - webbeans-api-1.0.0-SNAPSHOT.jar
- - webbeans-impl-1.0.0-SNAPSHOT.jar
+ - openwebbeans-api-1.0.0-SNAPSHOT.jar
+ - openwebbeans-impl-1.0.0-SNAPSHOT.jar
 
 There are also a dependent libraries. These dependent library jars
 are located in the directory "/lib/thirdparty". 
@@ -79,12 +79,12 @@
 
 > mvn clean install
 
-This command will install all the Maven artifacts in your local Maven respository.
+This command will install all the Maven artifacts in your local Maven repository.
 
 If you wish to build all the artifacts of the project, just run the following command
-in the src/ folder : 
+in the src/distribution folder : 
 
-> mvn clean package -Ddistribute=true
+> mvn clean package
 
 This command will package the project artifacts of the project from the source and put it into the "src/distribution/target/"
 directory.

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=736108&r1=736107&r2=736108&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Tue Jan 20 13:19:41 2009
@@ -136,7 +136,112 @@
     </developers>
 	
     <build>
-		<plugins>
+	 <pluginManagement>
+		    <plugins>
+		       <plugin>
+			    <groupId>org.apache.maven.plugins</groupId>
+			    <artifactId>maven-remote-resources-plugin</artifactId>
+			    <version>1.0</version>
+			    <executions>
+			        <execution>
+			            <goals>
+			                <goal>process</goal>
+			            </goals>
+			            <configuration>
+			                <resourceBundles>
+			                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+			                </resourceBundles>
+			            </configuration>
+			        </execution>
+			    </executions>
+			</plugin>
+		    </plugins>
+	</pluginManagement>
+
+	<plugins>
+
+		  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.2</version>
+                    <configuration>
+                        <archiveClasses>true</archiveClasses>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+
+                        <!--
+                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
+                              or in another jar file in the war.
+
+                        NOTE: targetPath is broken for webResources (as documented)
+                        -->
+                        <webResources>
+                            <resource>
+                                <directory>${project.build.outputDirectory}</directory>
+                                <includes>
+                                    <include>META-INF/LICENSE*</include>
+                                    <include>META-INF/NOTICE*</include>
+                                    <include>META-INF/DISCLAIMER*</include>
+                                </includes>
+                            </resource>
+                        </webResources>
+		            <archive>
+		                <manifestEntries>
+		                    <Specification-Title>${project.name}</Specification-Title>
+		                    <Specification-Version>${project.version}</Specification-Version>
+		                    <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+		                    <Implementation-Title>${project.name}</Implementation-Title>
+		                    <Implementation-Version>${project.version}</Implementation-Version>
+		                    <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+		                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+		                </manifestEntries>
+		            </archive>
+
+                    </configuration>
+                </plugin>
+
+		 <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-jar-plugin</artifactId>
+		        <configuration>
+		            <archive>
+		                <manifestEntries>
+		                    <Specification-Title>${project.name}</Specification-Title>
+		                    <Specification-Version>${project.version}</Specification-Version>
+		                    <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+		                    <Implementation-Title>${project.name}</Implementation-Title>
+		                    <Implementation-Version>${project.version}</Implementation-Version>
+		                    <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+		                    <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+		                </manifestEntries>
+		            </archive>
+		        </configuration>
+              </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Version>${project.version}</Specification-Version>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+            </plugin>
+
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
@@ -163,8 +268,8 @@
                     </execution>
                 </executions>
             </plugin>  
-		</plugins>
-	</build>
+	</plugins>
+    </build>
     
     <reporting>
         <plugins>