From 9cd325a0243ffb9e290f7d5b13bbe0f0797b2207 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 12 Oct 2011 21:36:23 +0000
Subject: [PATCH] Improve OSGi Boot

git-svn-id: https://svn.argeo.org/commons/trunk@4815 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/rpm/usr/sbin/osgi-service        | 41 ++++++----
 .../dep/org.argeo.security.dep.node/pom.xml   | 62 ++++++++++++++
 .../org.argeo.security.dep.node.rap/pom.xml   | 62 --------------
 .../WEB-INF/applicationContext.xml            | 12 +--
 .../WEB-INF/web.xml                           |  9 ++-
 .../WEB-INF/xmlremoting-servlet.xml           | 80 +++++++++----------
 6 files changed, 137 insertions(+), 129 deletions(-)

diff --git a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index cbaecf578..7d1ad6e5c 100644
--- a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -30,14 +30,17 @@ RETVAL=0
 start() {
 	cp $CONF_DIR/config.ini $CONF_RW/config.ini
 	touch $SHUTDOWN_FILE
-	cd $EXEC_DIR && $JVM \
+	cd $EXEC_DIR
+	$JVM \
 		-Dosgi.bundles="org.argeo.osgi.boot.jar@start" \
 		-Dargeo.osgi.bundles="$CONF_DIR/modules;in=*,$LIB_DIR;in=*" \
+		-Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
 		-Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
 		$JAVA_OPTS -jar $OSGI_FRAMEWORK \
+		-clean \
 		-configuration "$CONF_RW" \
 		-data "$DATA_DIR" \
-		&> $LOG_FILE &
+		&>> $LOG_FILE &
 	PID=$!
 	echo $PID > $PID_FILE
 	echo Started $APP with pid $PID
@@ -45,9 +48,20 @@ start() {
 }
 
 stop() {
-	PID=`cat $PID_FILE`
+	if [ -f $PID_FILE ];then
+		PID=`cat $PID_FILE`
+	else
+		return $RETVAL
+	fi
 	rm -f $SHUTDOWN_FILE
-	# TODO wait for process to finish until timeout, then kill
+	timeout 5m sh << EOF
+while kill -0 $PID &> /dev/null; do sleep 1; done
+EOF
+	TIMEOUT_EXIT=$?
+	if [ $TIMEOUT_EXIT -eq 124 ];then
+		kill -9 $PID
+	fi
+	rm -f $PID_FILE
 	echo Stopped $APP with pid $PID
 	return $RETVAL
 }
@@ -60,21 +74,20 @@ case "$2" in
   stop)
         stop
         ;;
-  restart|reload)
+  restart)
         stop
-        sleep 10
         start
         RETVAL=$?
         ;;
-  condrestart)
-  		echo Not implemented
-  		exit 1
-        ;;
   status)
-  		echo Not implemented
-  		exit 1
+	if [ -f $PID_FILE ];then
+		PID=`cat $PID_FILE`
+		echo $APP is running with pid $PID ...
+	else
+		echo $APP is not running
+	fi
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart}"
+        echo $"Usage: $0 {start|stop|restart|status}"
         exit 1
-esac
+esac
\ No newline at end of file
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index a62f23ecb..c73ccc453 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -117,6 +117,68 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
+		<!-- Javax -->
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>com.springsource.javax.annotation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>com.springsource.javax.xml.bind</artifactId>
+		</dependency>
+
+		<!-- Security -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.ldap</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ldap</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.services</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- Web -->
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.webextender</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr.mvc</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index af69f1b39..c51c4894c 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -67,68 +67,6 @@
 			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Javax -->
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>com.springsource.javax.annotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>com.springsource.javax.xml.bind</artifactId>
-		</dependency>
-
-		<!-- Security -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.services</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
-		<!-- Web -->
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.webextender</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
 		<!-- For Tomcat deployment -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
index 5e941f99e..6b6a54077 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -21,16 +21,10 @@
 	<bean id="sessionProvider" scope="session" init-method="init"
 		destroy-method="dispose" class="org.argeo.jackrabbit.remote.SimpleSessionProvider">
 		<aop:scoped-proxy proxy-target-class="false" />
-		<!-- <property name="credentials"> -->
-		<!-- <bean class="javax.jcr.SimpleCredentials"> -->
-		<!-- <constructor-arg value="root" /> -->
-		<!-- <constructor-arg value="demo" /> -->
-		<!-- </bean> -->
-		<!-- </property> -->
 	</bean>
 
-	<bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor">
-		<!-- <property name="session" ref="jcrSession" /> -->
-	</bean>
+<!-- 	<bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
+<!-- 		<property name="session" ref="jcrSession" /> -->
+<!-- 	</bean> -->
 
 </beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
index 2371e2917..e24236b41 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -40,7 +40,7 @@
 		<url-pattern>/remoting/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- XML remoting -->
+	<!-- XML remoting
 	<servlet>
 		<servlet-name>xmlremoting</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -54,7 +54,8 @@
 		<servlet-name>xmlremoting</servlet-name>
 		<url-pattern>*.jcr</url-pattern>
 	</servlet-mapping>
-
+ -->
+ 
 	<!-- WEBDAV servlet -->
 	<servlet>
 		<servlet-name>webdav</servlet-name>
@@ -80,7 +81,7 @@
 		<url-pattern>/public/webdav/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- JCR-MANAGER servlet -->
+	<!-- JCR-MANAGER servlet
 	<servlet>
 		<servlet-name>jcr-manager</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -95,7 +96,7 @@
 		<servlet-name>jcr-manager</servlet-name>
 		<url-pattern>/jcr-manager/*</url-pattern>
 	</servlet-mapping>
-
+ -->
 
 	<!--  Security -->
 	<filter>
diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml
index 61c886765..b6e2ade82 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/xmlremoting-servlet.xml
@@ -7,45 +7,45 @@
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-	<context:component-scan base-package="org.argeo.jcr.mvc" />
-
-	<bean name="/*.jcr" class="org.argeo.jcr.mvc.JcrBrowserController" />
-
-	<!-- Views -->
-	<bean name="getJcrItem" class="org.argeo.server.mvc.SerializingView">
-		<property name="serializer">
-			<bean class="org.argeo.jcr.mvc.JcrXmlServerSerializer" />
-		</property>
-	</bean>
-
-	<bean name="queryJcrNodes" class="org.argeo.server.mvc.SerializingView">
-		<property name="serializer" ref="jsonSerializer" />
-	</bean>
-
-	<bean name="queryJcrTable" class="org.argeo.server.mvc.SerializingView">
-		<property name="serializer" ref="jsonSerializer" />
-	</bean>
-
-	<bean name="500" class="org.argeo.server.mvc.SerializingView">
-		<property name="serializer" ref="jsonSerializer" />
-	</bean>
-
-	<!-- Serializers -->
-	<bean id="jsonSerializer" class="org.argeo.server.json.JsonServerSerializer" />
-
-	<!-- MVC -->
-	<bean id="handlerMapping"
-		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-		<property name="interceptors">
-			<list>
-				<ref bean="osivInterceptor" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="viewResolver"
-		class="org.springframework.web.servlet.view.BeanNameViewResolver" />
-
-	<bean class="org.argeo.server.mvc.DefaultHandlerExceptionResolver" />
+<!-- 	<context:component-scan base-package="org.argeo.jcr.mvc" /> -->
+
+<!-- 	<bean name="/*.jcr" class="org.argeo.jcr.mvc.JcrBrowserController" /> -->
+
+<!-- 	Views -->
+<!-- 	<bean name="getJcrItem" class="org.argeo.server.mvc.SerializingView"> -->
+<!-- 		<property name="serializer"> -->
+<!-- 			<bean class="org.argeo.jcr.mvc.JcrXmlServerSerializer" /> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
+
+<!-- 	<bean name="queryJcrNodes" class="org.argeo.server.mvc.SerializingView"> -->
+<!-- 		<property name="serializer" ref="jsonSerializer" /> -->
+<!-- 	</bean> -->
+
+<!-- 	<bean name="queryJcrTable" class="org.argeo.server.mvc.SerializingView"> -->
+<!-- 		<property name="serializer" ref="jsonSerializer" /> -->
+<!-- 	</bean> -->
+
+<!-- 	<bean name="500" class="org.argeo.server.mvc.SerializingView"> -->
+<!-- 		<property name="serializer" ref="jsonSerializer" /> -->
+<!-- 	</bean> -->
+
+<!-- 	Serializers -->
+<!-- 	<bean id="jsonSerializer" class="org.argeo.server.json.JsonServerSerializer" /> -->
+
+<!-- 	MVC -->
+<!-- 	<bean id="handlerMapping" -->
+<!-- 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping"> -->
+<!-- 		<property name="interceptors"> -->
+<!-- 			<list> -->
+<!-- 				<ref bean="osivInterceptor" /> -->
+<!-- 			</list> -->
+<!-- 		</property> -->
+<!-- 	</bean> -->
+
+<!-- 	<bean id="viewResolver" -->
+<!-- 		class="org.springframework.web.servlet.view.BeanNameViewResolver" /> -->
+
+<!-- 	<bean class="org.argeo.server.mvc.DefaultHandlerExceptionResolver" /> -->
 
 </beans>
\ No newline at end of file
-- 
2.30.2