X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=034f4a727a3c790d4a4b6fea65f2e7797efa8482;hb=ada1b6094ce69b2deb7218b49eda936b451db4de;hp=7b8c291ad65d15eec66631a3fe6458ab6ad8b5d0;hpb=8e097b1470aab6e956108acdbc5ddcd78488beec;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 7b8c291ad..034f4a727 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -117,17 +117,37 @@
 						<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="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.start"
 							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" />
+							location="${java.home}${file.separator}bin${file.separator}java -Xmx256m" />
 						<ant antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
 
 					</tasks>
@@ -248,7 +268,7 @@
 			<artifactId>com.springsource.org.apache.el</artifactId>
 			<version>6.0.18</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet.jsp</artifactId>