You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/03/01 02:59:44 UTC
svn commit: r513106 - in
/incubator/tuscany/java/sca/services/persistence/common/src:
main/java/org/apache/tuscany/service/persistence/common/
test/java/org/apache/tuscany/service/persistence/common/
Author: jmarino
Date: Wed Feb 28 17:59:43 2007
New Revision: 513106
URL: http://svn.apache.org/viewvc?view=rev&rev=513106
Log:
convert JPA extension up to using @Reference
Modified:
incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceContextProcessor.java
incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java
incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/PersistenceUnitTestCase.java
incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/TestService1.java
Modified: incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceContextProcessor.java?view=diff&rev=513106&r1=513105&r2=513106
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceContextProcessor.java (original)
+++ incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceContextProcessor.java Wed Feb 28 17:59:43 2007
@@ -29,9 +29,9 @@
import javax.persistence.PersistenceProperty;
import javax.transaction.TransactionManager;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -68,21 +68,21 @@
*
* @param service Implementation processor service.
*/
- public PersistenceContextProcessor(@Autowire ImplementationProcessorService service) {
+ public PersistenceContextProcessor(@Reference ImplementationProcessorService service) {
super(PersistenceContext.class, service);
}
- @Autowire
+ @Reference
public void setTransactionManager(TransactionManager transactionManager) {
this.transactionManager = transactionManager;
}
- @Autowire
+ @Reference
public void setComponentManager(ComponentManager componentManager) {
this.componentManager = componentManager;
}
- @Autowire
+ @Reference
public void setIntrospector(InterfaceJavaIntrospector introspector) {
this.introspector = introspector;
}
@@ -101,11 +101,10 @@
@SuppressWarnings("unchecked")
protected <T> void initProperty(JavaMappedProperty<T> property,
PersistenceContext annotation,
- CompositeComponent parent,
DeploymentContext context) throws ProcessingException {
String unitName = annotation.unitName();
- URI unitUri = parent.getUri().resolve(unitName);
+ URI unitUri = context.getComponentId().resolve(unitName);
EntityManagerFactory emf = (EntityManagerFactory) componentManager.getComponent(unitUri);
if (emf == null) {
Modified: incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java?view=diff&rev=513106&r1=513105&r2=513106
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java (original)
+++ incubator/tuscany/java/sca/services/persistence/common/src/main/java/org/apache/tuscany/service/persistence/common/PersistenceUnitProcessor.java Wed Feb 28 17:59:43 2007
@@ -23,10 +23,10 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.RegistrationException;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -56,20 +56,19 @@
private ComponentManager componentManager;
private InterfaceJavaIntrospector introspector;
- @Autowire
+ @Reference
public void setComponentManager(ComponentManager componentManager) {
this.componentManager = componentManager;
}
- @Autowire
+ @Reference
public void setIntrospector(InterfaceJavaIntrospector introspector) {
this.introspector = introspector;
}
@SuppressWarnings({"unchecked"})
- public void visitField(CompositeComponent parent,
- Field field,
+ public void visitField(Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
@@ -78,7 +77,7 @@
return;
}
String unitName = annotation.unitName();
- URI unitUri = parent.getUri().resolve(unitName);
+ URI unitUri = context.getComponentId().resolve(unitName);
AtomicComponent component = (AtomicComponent) componentManager.getComponent(unitUri);
EntityManagerFactory emf;
if (component == null) {
Modified: incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/PersistenceUnitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/PersistenceUnitTestCase.java?view=diff&rev=513106&r1=513105&r2=513106
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/PersistenceUnitTestCase.java (original)
+++ incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/PersistenceUnitTestCase.java Wed Feb 28 17:59:43 2007
@@ -1,9 +1,5 @@
package org.apache.tuscany.service.persistence.common;
-import static org.apache.tuscany.spi.bootstrap.ComponentNames.TUSCANY_SYSTEM;
-import org.apache.tuscany.spi.component.CompositeComponent;
-
-import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
import junit.framework.TestCase;
public class PersistenceUnitTestCase extends TestCase {
Modified: incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/TestService1.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/TestService1.java?view=diff&rev=513106&r1=513105&r2=513106
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/TestService1.java (original)
+++ incubator/tuscany/java/sca/services/persistence/common/src/test/java/org/apache/tuscany/service/persistence/common/TestService1.java Wed Feb 28 17:59:43 2007
@@ -5,24 +5,22 @@
import javax.persistence.PersistenceUnit;
import javax.transaction.TransactionManager;
-import org.apache.tuscany.spi.annotation.Autowire;
-
import org.apache.tuscany.api.annotation.Resource;
public class TestService1 {
-
+
@Resource
protected TransactionManager tx;
-
- @PersistenceUnit(unitName="test")
+
+ @PersistenceUnit(unitName = "test")
protected EntityManagerFactory emf;
-
+
public void testMethod() throws Exception {
-
+
tx.begin();
EntityManager em = emf.createEntityManager();
tx.commit();
-
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org