Author: lresende
Date: Sun Jan 6 16:37:07 2008
New Revision: 609482
URL: http://svn.apache.org/viewvc?rev=609482&view=rev
Log:
Removing duplicated collection interface + small updates and cleanup
Removed:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/collection/
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/sample/Abc.java
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml?rev=609482&r1=609481&r2=609482&view=diff
==============================================================================
---
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml
(original)
+++
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/pom.xml
Sun Jan 6 16:37:07 2008
@@ -78,24 +78,18 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-implementation-data-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-transaction</artifactId>
+ <artifactId>tuscany-host-embedded</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-transaction</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -106,6 +100,18 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java?rev=609482&r1=609481&r2=609482&view=diff
==============================================================================
---
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
(original)
+++
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/TuscanyJDBCConfigurationImpl.java
Sun Jan 6 16:37:07 2008
@@ -19,16 +19,15 @@
package org.apache.tuscany.sca.implementation.openjpa;
+import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+import org.apache.openjpa.ee.ManagedRuntime;
import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.DerbyDictionary;
-import org.apache.openjpa.kernel.BrokerImpl;
+import org.apache.openjpa.kernel.StoreContext;
import org.apache.openjpa.lib.conf.Configurations;
-import javax.sql.*;
-import org.apache.openjpa.ee.*;
-import org.apache.openjpa.kernel.*;
public class TuscanyJDBCConfigurationImpl extends JDBCConfigurationImpl {
private TransactionManager tm;
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java?rev=609482&r1=609481&r2=609482&view=diff
==============================================================================
---
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
(original)
+++
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProvider.java
Sun Jan 6 16:37:07 2008
@@ -51,13 +51,8 @@
ExtensionPointRegistry
extensionPoints) {
this.component = component;
this.implementation = implementation;
- tm =
-
(TransactionManager)extensionPoints.getExtensionPoint(org.apache.geronimo.transaction.manager.XAWork.class);
- try {
- // tm.begin();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ tm =
(TransactionManager)extensionPoints.getExtensionPoint(org.apache.geronimo.transaction.manager.XAWork.class);
+
initEntityManager();
}
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java?rev=609482&r1=609481&r2=609482&view=diff
==============================================================================
---
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
(original)
+++
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/main/java/org/apache/tuscany/sca/implementation/openjpa/provider/JPAImplementationProviderFactory.java
Sun Jan 6 16:37:07 2008
@@ -26,20 +26,19 @@
import org.apache.tuscany.sca.runtime.RuntimeComponent;
public class JPAImplementationProviderFactory implements
ImplementationProviderFactory<JPAImplementation> {
- private ExtensionPointRegistry eP;
+ private ExtensionPointRegistry extensionPointRegistry;
public JPAImplementationProviderFactory(ExtensionPointRegistry
extensionPoints) {
- eP = extensionPoints;
+ extensionPointRegistry = extensionPoints;
}
public ImplementationProvider
createImplementationProvider(RuntimeComponent component,
JPAImplementation implementation) {
- return new JPAImplementationProvider(component, implementation, eP);
+ return new JPAImplementationProvider(component, implementation,
extensionPointRegistry);
}
public Class<JPAImplementation> getModelType() {
- // TODO Auto-generated method stub
- return null;
+ return JPAImplementation.class;
}
}
Modified:
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/sample/Abc.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/sample/Abc.java?rev=609482&r1=609481&r2=609482&view=diff
==============================================================================
---
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/sample/Abc.java
(original)
+++
incubator/tuscany/sandbox/lresende/sca/modules/implementation-data-pojo/src/test/java/sample/Abc.java
Sun Jan 6 16:37:07 2008
@@ -29,6 +29,6 @@
id = i;
}
public String toString(){
- return "My Id is "+id;
+ return "Id is " + getId();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
