cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r796574 - in /incubator/cassandra/trunk: ./ interface/gen-java/org/apache/cassandra/service/ src/java/org/ test/unit/org/
Date Tue, 21 Jul 2009 23:03:07 GMT
Author: jbellis
Date: Tue Jul 21 23:03:06 2009
New Revision: 796574

URL: http://svn.apache.org/viewvc?rev=796574&view=rev
Log:
merge from 0.3 branch

Modified:
    incubator/cassandra/trunk/   (props changed)
    incubator/cassandra/trunk/NOTICE.txt
    incubator/cassandra/trunk/build.xml
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
  (props changed)
    incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
  (props changed)
    incubator/cassandra/trunk/src/java/org/   (props changed)
    incubator/cassandra/trunk/test/unit/org/   (props changed)

Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1 +1 @@
-/incubator/cassandra/branches/cassandra-0.3:774578-792198
+/incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: incubator/cassandra/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=796574&r1=796573&r2=796574&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Tue Jul 21 23:03:06 2009
@@ -1,65 +1,10 @@
 Apache Cassandra
 Copyright 2009 The Apache Software Foundation
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
 
-
-From Lucene's notice file:
-Apache Lucene
-Copyright 2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-The snowball stemmers in
-  contrib/snowball/src/java/net/sf/snowball
-were developed by Martin Porter and Richard Boulton.
-The full snowball package is available from
-  http://snowball.tartarus.org/
-
-
-
-From Groovy's notice file:
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Groovy Language distribution.                 ==
-   =========================================================================
-
-   Groovy Language
-   Copyright 2003-2007 The respective authors and developers
-   Developers and Contributors are listed in the project POM file
-
-   This product includes software developed by
-   The Groovy community (http://groovy.codehaus.org/).
-
-
-
-From Thrift's notice file:
-Apache Thrift
-Copyright 2006-2009 The Apache Software Foundation, et al.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Some files in this distribution are distributed under different terms
-from the rest of Apache Thrift.  Please see individual files for
-license information.
-
-In addition, the following unlabelled files are distributed under
-specific terms.  Please see the "doc" directory for the text of their
-licenses.
-
-  lib/rb/setup.rb:                   GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
-  lib/ocaml/OCamlMakefile:           GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
-  lib/ocaml/README-OCamlMakefile:    GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
-  lib/erl/build/beamver:             MIT License (otp-base-license.txt)
-  lib/erl/build/buildtargets.mk:     MIT License (otp-base-license.txt)
-  lib/erl/build/colors.mk:           MIT License (otp-base-license.txt)
-  lib/erl/build/docs.mk:             MIT License (otp-base-license.txt)
-  lib/erl/build/mime.types:          MIT License (otp-base-license.txt)
-  lib/erl/build/otp.mk:              MIT License (otp-base-license.txt)
-  lib/erl/build/otp_subdir.mk:       MIT License (otp-base-license.txt)
-  lib/erl/build/raw_test.mk:         MIT License (otp-base-license.txt)
-  lib/erl/src/Makefile:              MIT License (otp-base-license.txt)
+This product includes software developed by The Groovy community
+(http://groovy.codehaus.org/).
+Copyright 2003-2007 The respective authors and developers.
+Developers and Contributors are listed in the project POM file

Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=796574&r1=796573&r2=796574&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Tue Jul 21 23:03:06 2009
@@ -148,18 +148,21 @@
 	The jar target makes cassandra.jar output.
     -->
     <target name="jar" depends="build">
-    <jar jarfile="${build.dir}/${final.name}.jar"
-         basedir="${build.classes}">
-      <manifest>
+      <mkdir dir="${build.classes}/META-INF"/>
+      <copy file="LICENSE.txt" tofile="${build.classes}/META-INF/LICENSE.txt"/>
+      <copy file="NOTICE.txt" tofile="${build.classes}/META-INF/NOTICE.txt"/>
+      <jar jarfile="${build.dir}/${final.name}.jar"
+           basedir="${build.classes}">
+        <manifest>
         <!-- <section name="org/apache/cassandra/infrastructure"> -->
           <attribute name="Implementation-Title" value="Cassandra"/>
           <attribute name="Implementation-Version" value="${version}"/>
-          <attribute name="Implementation-Vendor" value="Facebook"/>
-	        <attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/>
+          <attribute name="Implementation-Vendor" value="Apache"/>
+          <attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/>
         <!-- </section> -->
-      </manifest>
-    </jar>
-  </target>
+        </manifest>
+      </jar>
+    </target>
 
     <!-- creates a release tarball -->	
     <target name="release" depends="jar,javadoc">

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1,2 +1,2 @@
-/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-792198
+/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1,2 +1,2 @@
-/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-792198
+/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588

Propchange: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1,2 +1,2 @@
-/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-792198
+/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588

Propchange: incubator/cassandra/trunk/src/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1,2 +1,2 @@
-/incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-792198
+/incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-796573
 /incubator/cassandra/trunk/src/java/org:749219-769885

Propchange: incubator/cassandra/trunk/test/unit/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 23:03:06 2009
@@ -1,2 +1,2 @@
-/incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-792198
+/incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-796573
 /incubator/cassandra/trunk/test/unit/org:749219-768583



Mime
View raw message