Author: lewismc
Date: Mon Apr 14 19:17:57 2014
New Revision: 1587288
URL: http://svn.apache.org/r1587288
Log:
remove unused classes and old GoraCompiler, move LicenseHeaders utils class to
new GoraCompiler module
Added:
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/LicenseHeaders.java
- copied, changed from r1587174,
gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java
Removed:
gora/trunk/gora-core/src/main/java/org/apache/gora/compiler/
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/ListGenericArray.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/State.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/StateManager.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/StatefulHashMap.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/StatefulMap.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/impl/StateManagerImpl.java
gora/trunk/gora-core/src/main/java/org/apache/gora/persistency/ws/impl/StateManagerWSImpl.java
gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java
Modified:
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
gora/trunk/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java
gora/trunk/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java
Modified:
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java?rev=1587288&r1=1587287&r2=1587288&view=diff
==============================================================================
---
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
(original)
+++
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
Mon Apr 14 19:17:57 2014
@@ -17,14 +17,12 @@
*/
package org.apache.gora.compiler;
-import java.beans.PersistenceDelegate;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -33,7 +31,6 @@ import org.apache.avro.Schema;
import org.apache.avro.Schema.Field;
import org.apache.avro.Schema.Type;
import org.apache.avro.compiler.specific.SpecificCompiler;
-import org.apache.avro.generic.GenericData.StringType;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.JsonNodeFactory;
Copied:
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/LicenseHeaders.java
(from r1587174,
gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java)
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/LicenseHeaders.java?p2=gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/LicenseHeaders.java&p1=gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java&r1=1587174&r2=1587288&rev=1587288&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/util/LicenseHeaders.java
(original)
+++
gora/trunk/gora-compiler/src/main/java/org/apache/gora/compiler/utils/LicenseHeaders.java
Mon Apr 14 19:17:57 2014
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.gora.util;
+package org.apache.gora.compiler.utils;
import java.util.HashMap;
@@ -42,6 +42,7 @@ public class LicenseHeaders {
private HashMap<String, String> relatedLicenses;
// ASLv2 license header
+ @SuppressWarnings("unused")
private static final String ASLv2 =
"/**\n" +
" *Licensed to the Apache Software Foundation (ASF) under one\n" +
@@ -62,6 +63,7 @@ public class LicenseHeaders {
" */\n";
// AGPLv3 license header
+ @SuppressWarnings("unused")
private static final String AGPLv3 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -76,6 +78,7 @@ public class LicenseHeaders {
" */\n";
// CDDLv1 license header
+ @SuppressWarnings("unused")
private static final String CDDLv1 =
"/**\n" +
" * COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0\n" +
@@ -96,6 +99,7 @@ public class LicenseHeaders {
" */\n";
// FDLv1.3 license header
+ @SuppressWarnings("unused")
private static final String FDLv13 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -113,6 +117,7 @@ public class LicenseHeaders {
" */\n";
// GPLv1 license header
+ @SuppressWarnings("unused")
private static final String GPLv1 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -131,6 +136,7 @@ public class LicenseHeaders {
" */\n";
// GPLv2 license header
+ @SuppressWarnings("unused")
private static final String GPLv2 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -149,6 +155,7 @@ public class LicenseHeaders {
" */\n";
// GPLv3 license header
+ @SuppressWarnings("unused")
private static final String GPLv3 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -167,6 +174,7 @@ public class LicenseHeaders {
" */\n";
// LGPLv21 license header
+ @SuppressWarnings("unused")
private static final String LGPLv21 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
@@ -185,6 +193,7 @@ public class LicenseHeaders {
" */\n";
// LGPLv3 license header
+ @SuppressWarnings("unused")
private static final String LGPLv3 =
"/**\n" +
" * This program is free software: you can redistribute it and/or
modify\n" +
Modified:
gora/trunk/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java?rev=1587288&r1=1587287&r2=1587288&view=diff
==============================================================================
---
gora/trunk/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java
(original)
+++
gora/trunk/gora-core/src/test/java/org/apache/gora/mock/persistency/MockPersistent.java
Mon Apr 14 19:17:57 2014
@@ -56,7 +56,8 @@ public class MockPersistent extends Pers
@Override
public Schema getSchema() {
- return
Schema.parse("{\"type\":\"record\",\"name\":\"MockPersistent\",\"namespace\":\"org.apache.gora.mock.persistency\",\"fields\":[{\"name\":\"foo\",\"type\":\"int\"},{\"name\":\"baz\",\"type\":\"int\"}]}");
+ Schema.Parser parser = new Schema.Parser();
+ return
parser.parse("{\"type\":\"record\",\"name\":\"MockPersistent\",\"namespace\":\"org.apache.gora.mock.persistency\",\"fields\":[{\"name\":\"foo\",\"type\":\"int\"},{\"name\":\"baz\",\"type\":\"int\"}]}");
}
public void setFoo(int foo) {
Modified:
gora/trunk/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java?rev=1587288&r1=1587287&r2=1587288&view=diff
==============================================================================
---
gora/trunk/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java
(original)
+++
gora/trunk/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java
Mon Apr 14 19:17:57 2014
@@ -20,8 +20,6 @@ package org.apache.gora.persistency.impl
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import org.apache.avro.Schema.Field;
import org.apache.avro.util.Utf8;
