Author: ppoddar
Date: Wed Dec 9 21:30:51 2009
New Revision: 888987
URL: http://svn.apache.org/viewvc?rev=888987&view=rev
Log:
Add missing ASL header.
Remove authorship temporarily till the authorship issues are sorted out.
Modified:
labs/fluid/src/main/java/org/apache/openjpa/das/FluidDAS.java
labs/fluid/src/main/java/org/apache/openjpa/das/FluidDASFactory.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDO2POJOGenerator.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDODynamicClassResolver.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEndTransactionListener.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManager.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManagerFactory.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOQuery.java
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOTypeParser.java
labs/fluid/src/main/java/serp/bytecode/Annotation.java
Modified: labs/fluid/src/main/java/org/apache/openjpa/das/FluidDAS.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/das/FluidDAS.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/das/FluidDAS.java (original)
+++ labs/fluid/src/main/java/org/apache/openjpa/das/FluidDAS.java Wed Dec 9
21:30:51 2009
@@ -74,7 +74,7 @@
* <code>"SELECT"</code>, <code>"DELETE"</code>.
*/
public Command createCommand(String cmd) {
- if (cmd==null)
+ if (cmd == null)
return null;
COMMANDS command = null;
try {
@@ -172,7 +172,8 @@
public void execute() {
em.begin();
for (Object data : params.values()) {
- if (data == null) continue;
+ if (data == null)
+ continue;
em.persist(data);
}
em.commit();
@@ -201,11 +202,9 @@
public void setParameter(int index, Object value) {
if (index != 1)
- throw new
IllegalArgumentException(error("find-bad-index",
- index, value));
+ throw new
IllegalArgumentException(error("find-bad-index", index, value));
if (!(value instanceof String))
- throw new
IllegalArgumentException(error("find-bad-value",
- index, value));
+ throw new
IllegalArgumentException(error("find-bad-value", index, value));
super.setParameter(index, value);
}
@@ -237,8 +236,7 @@
public void setParameter(int index, Object value) {
if (index <= 0)
- throw new
IllegalArgumentException(error("query-bad-query",
- index, value));
+ throw new
IllegalArgumentException(error("query-bad-query", index, value));
super.setParameter(index, value);
}
@@ -260,8 +258,7 @@
}
DataObject wrap(List<DataObject> list) {
- AnyTypeDataObject any = SDOFactory.eINSTANCE
- .createAnyTypeDataObject();
+ AnyTypeDataObject any =
SDOFactory.eINSTANCE.createAnyTypeDataObject();
any.set("list", list);
return any;
}
@@ -286,7 +283,8 @@
public void execute() {
em.begin();
for (Object data : params.values()) {
- if (data == null) continue;
+ if (data == null)
+ continue;
em.remove(data);
}
em.commit();
Modified: labs/fluid/src/main/java/org/apache/openjpa/das/FluidDASFactory.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/das/FluidDASFactory.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/das/FluidDASFactory.java
(original)
+++ labs/fluid/src/main/java/org/apache/openjpa/das/FluidDASFactory.java Wed
Dec 9 21:30:51 2009
@@ -64,8 +64,7 @@
*/
public FluidDASFactory(String unitName) {
try {
- emf = (SDOEntityManagerFactory)Persistence
- .createEntityManagerFactory(unitName);
+ emf =
(SDOEntityManagerFactory)Persistence.createEntityManagerFactory(unitName);
} catch (ClassCastException ex) {
throw new
RuntimeException(_loc.get("not-fluid").toString());
}
Modified: labs/fluid/src/main/java/org/apache/openjpa/sdo/SDO2POJOGenerator.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDO2POJOGenerator.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/sdo/SDO2POJOGenerator.java
(original)
+++ labs/fluid/src/main/java/org/apache/openjpa/sdo/SDO2POJOGenerator.java Wed
Dec 9 21:30:51 2009
@@ -20,11 +20,9 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -34,7 +32,6 @@
import org.apache.openjpa.conf.OpenJPAConfigurationImpl;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.log.LogFactoryImpl;
-import org.apache.openjpa.lib.log.Log4JLogFactory;
import org.apache.openjpa.lib.util.Files;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.lib.util.Options;
@@ -43,13 +40,7 @@
import org.apache.openjpa.sdo.mapping.TypeMapping;
import org.apache.openjpa.util.UserException;
-import serp.bytecode.BCClass;
-import serp.bytecode.BCMethod;
-import serp.bytecode.Code;
-
-import commonj.sdo.Property;
import commonj.sdo.Type;
-import commonj.sdo.helper.XSDHelper;
/**
* Generates Java source code from SDO Type.
Modified:
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDODynamicClassResolver.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDODynamicClassResolver.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
---
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDODynamicClassResolver.java
(original)
+++
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDODynamicClassResolver.java
Wed Dec 9 21:30:51 2009
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.sdo;
import org.apache.openjpa.lib.util.MultiClassLoader;
Modified:
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEndTransactionListener.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEndTransactionListener.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
---
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEndTransactionListener.java
(original)
+++
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEndTransactionListener.java
Wed Dec 9 21:30:51 2009
@@ -36,10 +36,8 @@
* are enabled, this manager should be installed as a transaction listener on
* all brokers so that it knows when commits are made.
*
- * @author Sergio Tabanelli
*/
-public class SDOEndTransactionListener
- implements EndTransactionListener {
+public class SDOEndTransactionListener implements EndTransactionListener {
private static final Localizer _loc =
Localizer.forPackage(SDOEndTransactionListener.class);
SDOEntityManager em;
Modified: labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManager.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManager.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManager.java
(original)
+++ labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManager.java Wed
Dec 9 21:30:51 2009
@@ -19,14 +19,10 @@
package org.apache.openjpa.sdo;
-import java.lang.reflect.Method;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.apache.openjpa.enhance.Reflection;
import org.apache.openjpa.kernel.Broker;
import org.apache.openjpa.kernel.Query;
import org.apache.openjpa.kernel.jpql.JPQLParser;
@@ -34,11 +30,9 @@
import org.apache.openjpa.persistence.EntityManagerImpl;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openjpa.sdo.mapping.TypeMapping;
-import org.apache.openjpa.util.OptimisticException;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
import commonj.sdo.Type;
/**
Modified:
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManagerFactory.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManagerFactory.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
---
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManagerFactory.java
(original)
+++
labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOEntityManagerFactory.java
Wed Dec 9 21:30:51 2009
@@ -23,7 +23,6 @@
import org.apache.openjpa.persistence.EntityManagerFactoryImpl;
import org.apache.openjpa.persistence.EntityManagerImpl;
-
/**
* A specialized factory to convert SDO DataObject to collection of
* strongly-typed, PersistenceCapable Java instances.
Modified: labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOQuery.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOQuery.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOQuery.java (original)
+++ labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOQuery.java Wed Dec 9
21:30:51 2009
@@ -28,8 +28,6 @@
import org.apache.openjpa.persistence.PersistenceExceptions;
import org.apache.openjpa.persistence.QueryImpl;
-import commonj.sdo.DataObject;
-
/**
* A Query that returns SDO DataObjects instead of PersistenceCapable POJOs.
*
Modified: labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOTypeParser.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOTypeParser.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOTypeParser.java
(original)
+++ labs/fluid/src/main/java/org/apache/openjpa/sdo/SDOTypeParser.java Wed Dec
9 21:30:51 2009
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.sdo;
import java.io.IOException;
Modified: labs/fluid/src/main/java/serp/bytecode/Annotation.java
URL:
http://svn.apache.org/viewvc/labs/fluid/src/main/java/serp/bytecode/Annotation.java?rev=888987&r1=888986&r2=888987&view=diff
==============================================================================
--- labs/fluid/src/main/java/serp/bytecode/Annotation.java (original)
+++ labs/fluid/src/main/java/serp/bytecode/Annotation.java Wed Dec 9 21:30:51
2009
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package serp.bytecode;
import java.io.*;
@@ -11,17 +29,15 @@
/**
* A declared annotation.
*
- * @author Abe White
*/
public class Annotation implements BCEntity, VisitAcceptor {
private static Method ENUM_VALUEOF = null;
private static Method ENUM_NAME = null;
static {
try {
- Class c = Class.forName("java.lang.Enum");
- ENUM_VALUEOF = c.getMethod("valueOf", new Class[] {
- Class.class, String.class });
- ENUM_NAME = c.getMethod("name", (Class[]) null);
+ Class<?> c = Class.forName("java.lang.Enum");
+ ENUM_VALUEOF = c.getMethod("valueOf", Class.class, String.class);
+ ENUM_NAME = c.getMethod("name", (Class[]) null);
} catch (Throwable t) {
// pre-1.5 JDK
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
