[jboss-svn-commits] JBL Code SVN: r28418 - in labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB: src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 25 07:58:42 EDT 2009
Author: whitingjr
Date: 2009-07-25 07:58:42 -0400 (Sat, 25 Jul 2009)
New Revision: 28418
Modified:
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/META-INF/persistence.xml
Log:
updated configuration.
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml 2009-07-25 11:58:06 UTC (rev 28417)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml 2009-07-25 11:58:42 UTC (rev 28418)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>uk.ac.ncl.sdia.a8905943</groupId>
- <artifactId>MVCCSampleEJB</artifactId>
+ <artifactId>CarWashEJB</artifactId>
<packaging>ejb</packaging>
<parent>
<artifactId>MVCCSample</artifactId>
@@ -19,24 +19,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- <generateClient>true</generateClient>
- <sourceDirectory>src/main/java</sourceDirectory>
- <archive>
- <manifest>
- <addClasspath>false</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
+
</project>
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java 2009-07-25 11:58:06 UTC (rev 28417)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java 2009-07-25 11:58:42 UTC (rev 28418)
@@ -11,8 +11,6 @@
import org.apache.log4j.Logger;
-import uk.ac.ncl.sdia.a8905943.showroom.spec.ShowroomLocal;
-import uk.ac.ncl.sdia.a8905943.showroom.spec.ShowroomRemote;
import uk.ac.ncl.sdia.mvcc.spec.PersonManager;
import uk.ac.ncl.sdia.mvcc.spec.PersonManagerLocal;
import uk.ac.ncl.sdia.mvcc.spec.PersonManagerRemote;
@@ -21,8 +19,6 @@
{
private static final String LOCAL_PERSON_MANAGER = "MVCCSampleEAR/PersonManager/local-uk.ac.ncl.sdia.mvcc.spec.PersonManagerLocal";
private static final String REMOTE_PERSON_MANAGER = "MVCCSampleEAR/PersonManager/remote-uk.ac.ncl.sdia.mvcc.spec.PersonManagerRemote";
- private static final String LOCAL_SHOWROOM_MANAGER = "MVCCSampleEAR/Showroom/local-uk.ac.ncl.sdia.mvcc.spec.ShowroomLocal";
- private static final String REMOTE_SHOWROOM_MANAGER = "MVCCSampleEAR/Showroom/remote-uk.ac.ncl.sdia.mvcc.spec.ShowroomRemote";
private static final String LOCAL_PROVIDER = "localhost:1099";
private static Logger logger = Logger.getLogger(ServiceLocator.class);
@@ -56,36 +52,7 @@
return l_return;
}
- public static ShowroomRemote findRemoteShowroom()
- {
- ShowroomRemote returnValue = null;
- Object reference = findObject(REMOTE_SHOWROOM_MANAGER, LOCAL_PROVIDER);
- if (null != reference)
- {
- returnValue = (ShowroomRemote)reference;
- }
- else
- {
- logger.error("Service Locator could not find a remote PersonManager using ["+REMOTE_SHOWROOM_MANAGER+"]");
- }
- return returnValue;
- }
-
- public static ShowroomLocal findLocalShowroom()
- {
- ShowroomLocal l_return = null;
- Object object = findObject(LOCAL_SHOWROOM_MANAGER, LOCAL_PROVIDER);
- if (null != object)
- {
- l_return = (ShowroomLocal)object;
- }
- else
- {
- logger.error("Service Locator could not find a local PersonManager using ["+LOCAL_SHOWROOM_MANAGER+"]");
- }
-
- return l_return;
- }
+
private static Object findObject(String _jndiName, String _provider)
{
Object l_return = null;
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/META-INF/persistence.xml 2009-07-25 11:58:06 UTC (rev 28417)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/resources/META-INF/persistence.xml 2009-07-25 11:58:42 UTC (rev 28418)
@@ -10,15 +10,8 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
</properties>
-
- <!-- <jta-data-source>java:/XAstmDS</jta-data-source>
-
- <properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
- </properties>
- -->
</persistence-unit>
-
+ <!--
<persistence-unit name="carshowroom" transaction-type="JTA">
<provider>uk.ac.ncl.sdia.a8905943.stm.persistence.STMPersistenceProviderImpl</provider>
<jta-data-source>java:/XAstmDS</jta-data-source>
@@ -26,4 +19,14 @@
<property name="ISOLATION_LEVEL" value="REPEATABLE_READ"/>
</properties>
</persistence-unit>
+
+ <persistence-unit name="carwash" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/XADerbyDS</jta-data-source>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ </properties>
+ </persistence-unit>
+ -->
+
</persistence>
More information about the jboss-svn-commits
mailing list