You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2010/03/20 00:18:01 UTC
svn commit: r925478 - in /incubator/ace/trunk:
ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
ace-target-devserver/src/main/resources/run.sh ace-webui/osgi.bnd
Author: marrs
Date: Fri Mar 19 23:18:01 2010
New Revision: 925478
URL: http://svn.apache.org/viewvc?rev=925478&view=rev
Log:
Fixes to make Web UI work. Update to run script to not remove the bundle cache between runs.
Modified:
incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh
incubator/ace/trunk/ace-webui/osgi.bnd
Modified: incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg?rev=925478&r1=925477&r2=925478&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg (original)
+++ incubator/ace/trunk/ace-target-devserver/src/main/resources/conf/org.apache.ace.server.activation.impl.cfg Fri Mar 19 23:18:01 2010
@@ -8,7 +8,7 @@ storeRepository = shop
customerName = apache
hostName = http://localhost:8080
endpoint = /repository
-obrUrl = http://localhost:8082/obr/
+obrUrl = http://localhost:8080/obr/
activationInfoRepository = activationinfo
activationInfoTimeout = 604800000
checkoutInterval = 5000
Modified: incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh?rev=925478&r1=925477&r2=925478&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh (original)
+++ incubator/ace/trunk/ace-target-devserver/src/main/resources/run.sh Fri Mar 19 23:18:01 2010
@@ -1 +1 @@
-java -jar pax-runner.jar --workingDirectory=. scan-dir:required-bundles scan-dir:ace-bundles scan-file:file:platform.properties
\ No newline at end of file
+java -jar pax-runner.jar --ups --workingDirectory=. scan-dir:required-bundles scan-dir:ace-bundles scan-file:file:platform.properties
\ No newline at end of file
Modified: incubator/ace/trunk/ace-webui/osgi.bnd
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui/osgi.bnd?rev=925478&r1=925477&r2=925478&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui/osgi.bnd (original)
+++ incubator/ace/trunk/ace-webui/osgi.bnd Fri Mar 19 23:18:01 2010
@@ -34,11 +34,12 @@ Import-Package: \
com.allen_sauer.gwt.dnd.client;resolution:=optional, \
com.allen_sauer.gwt.dnd.client.drop;resolution:=optional, \
!org.apache.ace.server, \
+ !com.google.*, \
*
Dynamic-ImportPackage: *
-Bundle-ClassPath: WEB-INF/classes, WEB-INF/lib/gwt-servlet-1.7.1.jar
+Bundle-ClassPath: ., WEB-INF/classes, WEB-INF/lib/gwt-servlet-1.7.1.jar
Webapp-Context: webui