From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 13 Jul 2010 09:33:13 +0000 (+0000)
Subject: Take into account OSGiBoot renaming
X-Git-Tag: argeo-slc-2.1.7~1248
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2fe9bd0b18209b3e5b51fb6e7df6edd0fade4842;p=gpl%2Fargeo-slc.git

Take into account OSGiBoot renaming
Remove unused directories

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

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 3b5cc1530..d1ee0f3af 100644
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.slc</groupId>
@@ -84,6 +85,10 @@
 			<groupId>org.hsqldb</groupId>
 			<artifactId>com.springsource.org.hsqldb</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>com.springsource.org.h2</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
 			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
index 7ac1606ff..7422be388 100644
--- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
+++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
@@ -59,7 +59,7 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
 	public DetachedLauncher() {
 		// Override defaults
 		setSynchronous(false);
-		setMainClass("org.argeo.slc.osgiboot.Launcher");
+		setMainClass("org.argeo.osgi.boot.Launcher");
 	}
 
 	public void afterPropertiesSet() throws Exception {
diff --git a/runtime/org.argeo.slc.support.equinox/build.properties b/runtime/org.argeo.slc.support.equinox/build.properties
index da2d34268..d3a40a058 100644
--- a/runtime/org.argeo.slc.support.equinox/build.properties
+++ b/runtime/org.argeo.slc.support.equinox/build.properties
@@ -2,7 +2,7 @@ additional.bundles = org.argeo.slc.core,\
                      org.springframework.context,\
                      org.argeo.slc.unit,\
                      com.springsource.junit,\
-                     org.argeo.slc.osgiboot,\
+                     org.argeo.osgi.boot,\
                      org.eclipse.osgi
 source.. = src/main/java/,\
            src/main/resources/,\
diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
index 472c9eb1a..dea2beaae 100644
--- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
+++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase;
-import org.argeo.slc.osgiboot.OsgiBoot;
+import org.argeo.osgi.boot.OsgiBoot;
 
 public class HelloTest extends AbstractOsgiRuntimeTestCase {
 	public void testHello() throws Exception {
diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
deleted file mode 100644
index 24c04460f..000000000
--- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="true">
-	
-	<description>Deprecated, use
-		classpath:/org/argeo/slc/hibernate/spring.xml instead</description>
-		
-	<import resource="classpath:/org/argeo/slc/hibernate/spring.xml" />
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
index b750c99b7..0e3941ade 100644
--- a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
+++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.osgiboot.OsgiBoot;
+import org.argeo.osgi.boot.OsgiBoot;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;