From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 13 Nov 2008 11:02:14 +0000 (+0000)
Subject: Revert to jar packaging type
X-Git-Tag: argeo-slc-2.1.7~2431
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9105ac062b904559519b232c73a99e485d5f54f4;p=gpl%2Fargeo-slc.git

Revert to jar packaging type

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

diff --git a/org.argeo.slc.detached/.classpath b/org.argeo.slc.detached/.classpath
index 0c8d72cae..c8b783048 100644
--- a/org.argeo.slc.detached/.classpath
+++ b/org.argeo.slc.detached/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.3.1_20"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.3"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml
index 8a945da73..c8de37848 100644
--- a/org.argeo.slc.detached/pom.xml
+++ b/org.argeo.slc.detached/pom.xml
@@ -1,90 +1,99 @@
-<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>
-        <artifactId>argeo-slc</artifactId>
-        <version>0.11.1-SNAPSHOT</version>
-        <relativePath>../org.argeo.slc</relativePath>
-    </parent>
-    <artifactId>org.argeo.slc.detached</artifactId>
-    <name>Argeo SLC Detached</name>
-    <packaging>bundle</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <manifestLocation>
-                        src/main/resources/META-INF
-                    </manifestLocation>
-                    <instructions>
-                        <Bundle-SymbolicName>
-                            ${pom.artifactId}
-                        </Bundle-SymbolicName>
-                        <Bundle-Activator>
-                            org.argeo.slc.detached.Activator
+<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>
+		<artifactId>argeo-slc</artifactId>
+		<version>0.11.1-SNAPSHOT</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.detached</artifactId>
+	<name>Argeo SLC Detached</name>
+	<packaging>jar</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.3</version>
+				<extensions>true</extensions>
+				<configuration>
+					<manifestLocation>src/main/resources/META-INF</manifestLocation>
+					<instructions>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+							</Bundle-SymbolicName>
+						<Bundle-Activator>
+							org.argeo.slc.detached.Activator
                         </Bundle-Activator>
-                        <Export-Package>
-                            org.argeo.slc.detached.*
+						<Export-Package>
+							org.argeo.slc.detached.*
                         </Export-Package>
-                        <Import-Package>
-                            *,
-                            org.springframework.beans.factory;version="2.0",
-                            org.springframework.beans.factory.support;version="2.0",
-                            org.springframework.beans.factory.xml;version="2.0",
-                            org.springframework.context;version="2.0",
-                            org.springframework.context.support;version="2.0",
-                            org.springframework.core.io;version="2.0"
+						<Import-Package>
+							*,
+							org.springframework.beans.factory;version="2.0",
+							org.springframework.beans.factory.support;version="2.0",
+							org.springframework.beans.factory.xml;version="2.0",
+							org.springframework.context;version="2.0",
+							org.springframework.context.support;version="2.0",
+							org.springframework.core.io;version="2.0"
                         </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.3</source>
-                    <target>1.3</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
+						<_removeheaders>Bnd-LastModified</_removeheaders>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.3</source>
+					<target>1.3</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.core</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file