</properties>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <includeTypes>war</includeTypes>
- <stripVersion>true</stripVersion>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </plugin>
- -->
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId> <configuration>
+ <includeTypes>war</includeTypes> <stripVersion>true</stripVersion>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots> </configuration>
+ </plugin>
+ -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<tasks>
-
+
<property name="equinoxDir" location="${project.build.directory}/equinox" />
-
+
<property name="mavenClasspath" refid="maven.compile.classpath" />
- <!--
- <property name="jar.asm.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar" />
- <property name="jar.asm.attrs.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
+ <!--
+ <property name="jar.asm.153"
+ location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar"
+ /> <property name="jar.asm.attrs.153"
+ location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar"
+ />
-->
- <property name="jar.asm.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
- <property name="jar.asm.attrs.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
-
- <property name="bundle.argeo.ria" location="../../org.argeo.slc.webapp/src/main/webapp" />
-
- <property name="slc.osgi.locations" value="${bundle.argeo.ria}${path.separator}${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
-
+ <property name="jar.asm.153"
+ location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
+ <property name="jar.asm.attrs.153"
+ location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
+
+ <property name="bundle.argeo.ria"
+ location="../../org.argeo.slc.webapp/src/main/webapp" />
+
+ <property name="slc.osgi.locations.rawold"
+ value="${bundle.argeo.ria}:${jar.asm.153}:${jar.asm.attrs.153}:${mavenClasspath}" />
+
+ <path id="slc.osgi.locations.raw">
+ <dirset dir="${user.dir}/bundles">
+ <include name="*"/>
+ <exclude name=".svn"/>
+ </dirset>
+ <dirset dir="${user.dir}/../../demo/site">
+ <include name="*"/>
+ <exclude name=".svn"/>
+ </dirset>
+ <pathelement location="${bundle.argeo.ria}" />
+ <pathelement location="${jar.asm.153}" />
+ <pathelement location="${jar.asm.attrs.153}" />
+ <path refid="maven.compile.classpath" />
+ </path>
+ <pathconvert dirsep="/" property="slc.osgi.locations"
+ refid="slc.osgi.locations.raw">
+ </pathconvert>
+
+<!--
<property name="slc.osgi.devBases"
value="${user.dir}/bundles,${user.dir}/../../demo/site" />
- <property name="slc.osgi.devPatterns"
- value="*" />
+ <property name="slc.osgi.devPatterns" value="*" />
+ -->
<property name="slc.osgi.start"
- value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
+ value="org.springframework.osgi.catalina.start.osgi,org.springframework.osgi.extender,org.springframework.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
<property name="javaCommand"
- location="${java.home}${file.separator}bin${file.separator}java" />
- <ant
- antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
+ location="${java.home}${file.separator}bin${file.separator}java -Xmx256m" />
+ <ant antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
</tasks>
</configuration>
<artifactId>com.springsource.org.aopalliance</artifactId>
<version>1.0.0</version>
</dependency>
-
-
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
- <version>1.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
- <version>2.2.0</version>
- </dependency>
-
+ <!--
+ <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
+ <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+ </dependency>
+ -->
+
<!--
<dependency> <groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.web.extender</artifactId>
<artifactId>org.springframework.osgi.web</artifactId> </dependency>
-->
<!--
- Using springsource repo <dependency>
+ Using springsource repo -->
+ <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.web.extender</artifactId>
- </dependency> <dependency>
+ </dependency>
+ <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>org.springframework.osgi.extender</artifactId>
- </dependency> <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>org.springframework.osgi.web</artifactId> </dependency>
- <dependency> <groupId>org.apache.catalina</groupId>
- <artifactId>com.springsource.org.apache.catalina</artifactId>
- </dependency> <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
- <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
- </dependency> <dependency> <groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet.jsp</artifactId>
- </dependency> <dependency> <groupId>javax.el</groupId>
- <artifactId>com.springsource.javax.el</artifactId> </dependency>
- <dependency> <groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
- </dependency> <dependency> <groupId>org.apache.taglibs</groupId>
- <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
- </dependency>
- -->
-
- <!-- Using spring osgi repo -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>
- com.springsource.org.apache.log4j
- </artifactId>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.web</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>catalina.osgi</artifactId>
- <version>5.5.23-SNAPSHOT</version>
+ <groupId>org.apache.catalina</groupId>
+ <artifactId>com.springsource.org.apache.catalina</artifactId>
</dependency>
-
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>catalina.start.osgi</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.jasper</groupId>
+ <artifactId>com.springsource.org.apache.jasper</artifactId>
+ <version>6.0.18</version>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>jasper.osgi</artifactId>
- <version>5.5.23-SNAPSHOT</version>
+ <groupId>org.apache.el</groupId>
+ <artifactId>com.springsource.org.apache.el</artifactId>
+ <version>6.0.18</version>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>commons-el.osgi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet.jsp</artifactId>
</dependency>
-
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>jstl.osgi</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <groupId>javax.el</groupId>
+ <artifactId>com.springsource.javax.el</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>servlet-api.osgi</artifactId>
- <version>2.5-SNAPSHOT</version>
- <type>jar</type>
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>jsp-api.osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
</dependency>
- <!-- -->
+
+ <!-- Using spring osgi repo -->
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-web</artifactId>
- <version>${spring-osgi.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
</dependency>
-
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-web-extender</artifactId>
- <version>${spring-osgi.version}</version>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>
+ com.springsource.org.apache.log4j
+ </artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>${spring-osgi.version}</version>
+ <artifactId>catalina.start.osgi</artifactId>
+ <version>1.0.0</version>
</dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>catalina.osgi</artifactId>-->
+ <!-- <version>5.5.23-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>jasper.osgi</artifactId>-->
+ <!-- <version>5.5.23-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>commons-el.osgi</artifactId>-->
+ <!-- <version>1.0-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>jstl.osgi</artifactId>-->
+ <!-- <version>1.1.2-SNAPSHOT</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>servlet-api.osgi</artifactId>-->
+ <!-- <version>2.5-SNAPSHOT</version>-->
+ <!-- <type>jar</type>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>jsp-api.osgi</artifactId>-->
+ <!-- <version>2.0-SNAPSHOT</version>-->
+ <!-- <type>jar</type>-->
+ <!-- </dependency>-->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
- </dependency>
+ <!-- -->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>spring-osgi-web</artifactId>-->
+ <!-- <version>${spring-osgi.version}</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>spring-osgi-web-extender</artifactId>-->
+ <!-- <version>${spring-osgi.version}</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework.osgi</groupId>-->
+ <!-- <artifactId>spring-osgi-extender</artifactId>-->
+ <!-- <version>${spring-osgi.version}</version>-->
+ <!-- </dependency>-->
+<!---->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework</groupId>-->
+ <!-- <artifactId>spring-web</artifactId>-->
+ <!-- <version>${spring.version}</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework</groupId>-->
+ <!-- <artifactId>spring-context</artifactId>-->
+ <!-- <version>${spring.version}</version>-->
+ <!-- </dependency>-->
+<!---->
+ <!-- <dependency>-->
+ <!-- <groupId>org.springframework</groupId>-->
+ <!-- <artifactId>spring-webmvc</artifactId>-->
+ <!-- <version>${spring.version}</version>-->
+ <!-- </dependency>-->
<!-- Required in JDK 1.5 -->
<dependency>
<version>1.2.2</version>
</dependency>
- <!-- To launch OSGi -->
- <dependency>
- <groupId>org.argeo.slc</groupId>
+ <!--
+ To launch OSGi <dependency> <groupId>org.argeo.slc</groupId>
<artifactId>org.argeo.slc.detached.launcher</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+ <version>${project.version}</version> </dependency>
+ -->
- <!-- For demo -->
- <dependency>
+ <!-- For demo -->
+ <dependency>
<groupId>org.argeo.slc.runtime</groupId>
<artifactId>org.argeo.slc.support.equinox</artifactId>
</dependency>
<artifactId>org.argeo.slc.support.maven</artifactId>
<version>${project.version}</version>
</dependency>
-
+
</dependencies>
<repositories>
projects / gpl / argeo-slc.git / blobdiff