[jboss-svn-commits] JBL Code SVN: r8438 - in labs/jbosslabs/trunk/portal-extensions/jmm: . jmm-service jmm-service/conf jmm-service/etc jmm-service/src/etc/META-INF

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 20 10:12:20 EST 2006


Author: wrzep
Date: 2006-12-20 10:12:01 -0500 (Wed, 20 Dec 2006)
New Revision: 8438

Added:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf/
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf/JMM-ds.xml.sample
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/etc/
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/etc/mysql-connector-java-3.1.12-bin.jar
Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/etc/META-INF/persistence.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-815
Pawel



Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf
___________________________________________________________________
Name: svn:ignore
   + JMM-ds.xml



Added: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf/JMM-ds.xml.sample
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf/JMM-ds.xml.sample	2006-12-20 14:22:59 UTC (rev 8437)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/conf/JMM-ds.xml.sample	2006-12-20 15:12:01 UTC (rev 8438)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>JMM_DS</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/dbname?useServerPrepStmts=false</connection-url>
+    <driver-class>org.gjt.mm.mysql.Driver</driver-class>
+    <user-name>username</user-name>
+    <password>password</password>
+  </local-tx-datasource>
+</datasources>

Added: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/etc/mysql-connector-java-3.1.12-bin.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/etc/mysql-connector-java-3.1.12-bin.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml	2006-12-20 14:22:59 UTC (rev 8437)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml	2006-12-20 15:12:01 UTC (rev 8438)
@@ -35,6 +35,7 @@
 	<goal name="deploy">
 		<attainGoal name="deploy-sar"/>	
 		<attainGoal name="deploy-ejb"/>
+		<attainGoal name="copy-configuration"/>
 	</goal>	
 	
 	<goal name="deploy-sar">
@@ -43,36 +44,27 @@
 		          <ant:filename name="**/${jmm.service.sar}/**" />
 		    </ant:fileset>
 		</ant:copy>
-<!-- 	<ant:copy todir="${jmm.service.deploy.dir}/${jmm.service.sar}">
-		     <ant:fileset dir="target/forge-jmm/WEB-INF/lib" flatten="true" overwrite="true">
-		          <ant:filename name="*.jar" />
-		    </ant:fileset>
-		</ant:copy>  -->
 	</goal>
 	
 		<goal name="deploy-ejb">
 	  	<ant:copy todir="${jmm.service.deploy.dir}" file="target/${jmm.service.final.name}" />
 	</goal>
 	
+	<goal name="copy-configuration">
+		<ant:copy todir="${jmm.service.deploy.dir}" overwrite="true">
+	    		<ant:fileset dir="conf">
+				<exclude name="**/*.sample"/>
+			</ant:fileset>
+		</ant:copy>
+	</goal>
+	
 	<goal name="clean">
 		<attainGoal name="module-clean" />
-
-		<!-- Clead old "status" files -->
-		<ant:delete file="${local.deploy.dir}/forge-status.war" />
-		<ant:delete file="${local.deploy.dir}/status-service.ejb3" />
-		<ant:delete file="${local.deploy.dir}/status-common.jar" />
-		
-		<!-- Clean JMM service local files (in case we want to use remote service) -->
-		<ant:delete file="${local.deploy.dir}/jmm-service.ejb3" />
-		<ant:delete dir="${local.deploy.dir}/jmm-service.sar" />
 	</goal>
 
-	<!-- TODO INSTALL -->
-	<goal name="service-install">
+	<goal name="install">
 	       	<ant:copy todir="${jmm.service.server.dir}/server/all/lib"
-		                  file="${ext.root.dir}/mysql-connector/mysql-connector-java-3.1.12-bin.jar" />
-		<ant:copy todir="${jmm.service.deploy.dir}"
-		                  file="${ext.root.dir}/configuration/to-copy/server/all/deploy/JBLabs-ds.xml" />
+		                  file="etc/mysql-connector-java-3.1.12-bin.jar" />
 	</goal>
 
 	

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/etc/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/etc/META-INF/persistence.xml	2006-12-20 14:22:59 UTC (rev 8437)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/etc/META-INF/persistence.xml	2006-12-20 15:12:01 UTC (rev 8438)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence>
 	<persistence-unit name="scores">
-		<jta-data-source>java:/LabsDS</jta-data-source>
+		<jta-data-source>java:/JMM_DS</jta-data-source>
 		<properties>
 			<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
 			<property name="hibernate.hbm2ddl.auto" value="update" />

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 14:22:59 UTC (rev 8437)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 15:12:01 UTC (rev 8438)
@@ -45,7 +45,16 @@
 			   
 	</goal>
 	
-	<goal name="clean"/>
+	<goal name="clean">
+		<!-- Clead old "status" files -->
+		<ant:delete file="${local.deploy.dir}/forge-status.war" />
+		<ant:delete file="${local.deploy.dir}/status-service.ejb3" />
+		<ant:delete file="${local.deploy.dir}/status-common.jar" />
+		
+		<!-- Clean JMM service local files (in case we want to use remote service) -->
+		<ant:delete file="${local.deploy.dir}/jmm-service.ejb3" />
+		<ant:delete dir="${local.deploy.dir}/jmm-service.sar" />
+	</goal>
 
 	<!--  helper goals -->
 




More information about the jboss-svn-commits mailing list