From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 25 Oct 2012 16:09:32 +0000 (+0000)
Subject: Remove unused modules
X-Git-Tag: argeo-commons-2.1.30~799
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c61ab583504a3fc57b24cab338f9029ad3b6d295;p=lgpl%2Fargeo-commons.git

Remove unused modules

git-svn-id: https://svn.argeo.org/commons/trunk@5654 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
deleted file mode 100644
index 4aeda080e..000000000
--- a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<service ref="dataSource" interface="javax.sql.DataSource" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
deleted file mode 100644
index f5ff99c0d..000000000
--- a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="false">
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-		<property name="locations">
-			<value>osgibundle:hsqldb.properties
-			</value>
-		</property>
-	</bean>
-
-	<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
-		<property name="database" value="${argeo.server.jdbc.url}" />
-		<property name="user" value="${argeo.server.jdbc.username}" />
-		<property name="password" value="${argeo.server.jdbc.password}" />
-
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.hsqldb/hsqldb.properties b/server/modules/org.argeo.server.hsqldb/hsqldb.properties
deleted file mode 100644
index 9053e4eac..000000000
--- a/server/modules/org.argeo.server.hsqldb/hsqldb.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-argeo.server.jdbc.url=jdbc:hsqldb:mem:test
-argeo.server.jdbc.username=sa
-argeo.server.jdbc.password=
diff --git a/server/modules/org.argeo.server.hsqldb/pom.xml b/server/modules/org.argeo.server.hsqldb/pom.xml
deleted file mode 100644
index 8b24de105..000000000
--- a/server/modules/org.argeo.server.hsqldb/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.commons.server</groupId>
-		<version>1.1.5-SNAPSHOT</version>
-		<artifactId>modules</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.server.hsqldb</artifactId>
-	<name>Commons Server Default HSQL Datasource</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml b/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml
deleted file mode 100644
index 0a1205924..000000000
--- a/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="false">
-
-	<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="locations">
-			<value>osgibundle:mysql.properties
-			</value>
-		</property>
-	</bean>
-
-	<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="dataSource" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-                hibernate.hbm2ddl.auto=update
-                hibernate.connection.autocommit=false
-            ]]></value>
-		</property>
-	</bean>
-	<!--
-		<bean id="dataSource"
-		class="org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy">
-		<property name="targetDataSource"> <bean
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy"> <property name="driverClassName"
-		value="com.mysql.jdbc.Driver" /> <property name="url"
-		value="jdbc:mysql://localhost/sparta_prod" /> <property
-		name="username" value="root" /> <property name="password" value="" />
-		<property name="suppressClose" value="true" /> <property
-		name="autoCommit" value="false" /> </bean> </property> </bean>
-	-->
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
-		destroy-method="close">
-		<property name="driverClassName" value="com.mysql.jdbc.Driver" />
-		<property name="url" value="${argeo.server.jdbc.url}" />
-		<property name="username" value="${argeo.server.jdbc.username}" />
-		<property name="password" value="${argeo.server.jdbc.password}" />
-		<property name="testOnBorrow" value="true" />
-		<property name="validationQuery" value="SELECT 1" />
-		<property name="maxActive" value="10" />
-		<property name="maxIdle" value="2" />
-	</bean>
-
-
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.mysql/META-INF/spring/osgi.xml b/server/modules/org.argeo.server.mysql/META-INF/spring/osgi.xml
deleted file mode 100644
index 6d7b0e6f1..000000000
--- a/server/modules/org.argeo.server.mysql/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<service ref="sessionFactory" interface="org.hibernate.SessionFactory" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.mysql/mysql.properties b/server/modules/org.argeo.server.mysql/mysql.properties
deleted file mode 100644
index bb5cee8eb..000000000
--- a/server/modules/org.argeo.server.mysql/mysql.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-argeo.server.jdbc.url=jdbc:mysql://localhost/argeo
-argeo.server.jdbc.username=root
-argeo.server.jdbc.password=
diff --git a/server/modules/org.argeo.server.mysql/pom.xml b/server/modules/org.argeo.server.mysql/pom.xml
deleted file mode 100644
index 2f37a250f..000000000
--- a/server/modules/org.argeo.server.mysql/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.argeo.commons.server</groupId>
-		<version>1.1.5-SNAPSHOT</version>
-		<artifactId>modules</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.server.mysql</artifactId>
-	<name>Commons Server Default MySQL DB Config</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-							com.mysql.jdbc,
-							net.sf.ehcache.hibernate;resolution:=optional,
-							org.springframework.cache.ehcache;resolution:=optional,
-							org.springframework.jdbc.datasource,
-							org.springframework.orm.hibernate3,
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index d9e7c7c28..472b93260 100644
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -20,9 +20,7 @@
 		<module>org.argeo.server.activemq.broker</module>
 		<module>org.argeo.server.ads.server</module>
 		<module>org.argeo.server.catalina</module>
-		<module>org.argeo.server.hsqldb</module>
 		<module>org.argeo.server.jdbc</module>
-		<module>org.argeo.server.mysql</module>
 		<module>org.argeo.server.rap.webapp</module>
 		<module>org.argeo.server.tomcat</module>
 	</modules>