From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 1 Mar 2011 20:13:26 +0000 (+0000)
Subject: Revert add .war extension
X-Git-Tag: argeo-commons-2.1.30~1389
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0073eddfce43ecc3e608722e684e18b539b95476;p=lgpl%2Fargeo-commons.git

Revert add .war extension

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

diff --git a/server/modules/org.argeo.server.osgi.webapp.war/.project b/server/modules/org.argeo.server.osgi.webapp.war/.project
deleted file mode 100644
index 93ccf84c0..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.server.osgi.webapp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.osgi.webapp.war/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index fd884c249..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Mar 01 15:09:47 CET 2011
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.osgi.webapp.war/META-INF/MANIFEST.MF
deleted file mode 100644
index ca03a9268..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OSGi Webapp
-Bundle-SymbolicName: org.argeo.server.osgi.webapp
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Argeo
-Web-ContextPath: org.argeo.osgi.webapp
-Import-Package: org.eclipse.equinox.http.servlet;version="1.1.0",
- org.springframework.osgi.web.context.support;version="1.2.1",
- org.springframework.security;version="2.0.6.RELEASE",
- org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
- org.springframework.web.context;version="2.5.6.SEC01",
- org.springframework.web.filter;version="2.5.6.SEC01",
- org.springframework.web.servlet;version="2.5.6.SEC01",
- org.springframework.web.servlet.handler;version="2.5.6.SEC01",
- org.springframework.web.servlet.mvc;version="2.5.6.SEC01"
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/applicationContext.xml
deleted file mode 100644
index febc4b97c..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<import resource="osgi.xml" />
-<!--	<import resource="security.xml" />-->
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/osgi.xml b/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/osgi.xml
deleted file mode 100644
index d344cc8d6..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/osgi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
-
-	<reference id="_authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/security.xml b/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/security.xml
deleted file mode 100644
index d606d0300..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-	<security:http>
-		<security:form-login login-page="/rap?startup=secureWebUi" />
-		<security:intercept-url pattern="/**"
-			access="ROLE_USER,ROLE_ADMIN,ROLE_ANONYMOUS" />
-	</security:http>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/service-servlet.xml b/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/service-servlet.xml
deleted file mode 100644
index 7a052199e..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/service-servlet.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-
-	<bean id="urlMapping"
-		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="mappings">
-			<props>
-				<prop key="*">osgiServiceController</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="osgiServiceController"
-		class="org.springframework.web.servlet.mvc.ServletWrappingController">
-		<property name="servletClass">
-			<value>org.eclipse.equinox.http.servlet.HttpServiceServlet</value>
-		</property>
-		<property name="servletName">
-			<value>osgiService</value>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/web.xml b/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/web.xml
deleted file mode 100644
index 16388e449..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/WEB-INF/web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>Argeo OSGi Webapp</display-name>
-
-	<!-- General -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<display-name>Spring Context</display-name>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-	</context-param>
-
-	<!-- OSGi Http Service -->
-	<servlet>
-		<servlet-name>service</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextClass</param-name>
-			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>service</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- Security -->
-<!--	<filter>-->
-<!--		<filter-name>springSecurityFilterChain</filter-name>-->
-<!--		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>-->
-<!--	</filter>-->
-<!---->
-<!--	<filter-mapping>-->
-<!--		<filter-name>springSecurityFilterChain</filter-name>-->
-<!--		<url-pattern>/*</url-pattern>-->
-<!--	</filter-mapping>-->
-
-</web-app>
diff --git a/server/modules/org.argeo.server.osgi.webapp.war/build.properties b/server/modules/org.argeo.server.osgi.webapp.war/build.properties
deleted file mode 100644
index 29dea25a4..000000000
--- a/server/modules/org.argeo.server.osgi.webapp.war/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = META-INF/,\
-               WEB-INF/
diff --git a/server/modules/org.argeo.server.osgi.webapp/.project b/server/modules/org.argeo.server.osgi.webapp/.project
new file mode 100644
index 000000000..93ccf84c0
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.server.osgi.webapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..fd884c249
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Tue Mar 01 15:09:47 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..ca03a9268
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: OSGi Webapp
+Bundle-SymbolicName: org.argeo.server.osgi.webapp
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Argeo
+Web-ContextPath: org.argeo.osgi.webapp
+Import-Package: org.eclipse.equinox.http.servlet;version="1.1.0",
+ org.springframework.osgi.web.context.support;version="1.2.1",
+ org.springframework.security;version="2.0.6.RELEASE",
+ org.springframework.security.ui.webapp;version="2.0.6.RELEASE",
+ org.springframework.web.context;version="2.5.6.SEC01",
+ org.springframework.web.filter;version="2.5.6.SEC01",
+ org.springframework.web.servlet;version="2.5.6.SEC01",
+ org.springframework.web.servlet.handler;version="2.5.6.SEC01",
+ org.springframework.web.servlet.mvc;version="2.5.6.SEC01"
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..febc4b97c
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<import resource="osgi.xml" />
+<!--	<import resource="security.xml" />-->
+
+</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml
new file mode 100644
index 000000000..d344cc8d6
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
+
+	<reference id="_authenticationManager"
+		interface="org.springframework.security.AuthenticationManager" />
+</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml
new file mode 100644
index 000000000..d606d0300
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
+
+	<security:http>
+		<security:form-login login-page="/rap?startup=secureWebUi" />
+		<security:intercept-url pattern="/**"
+			access="ROLE_USER,ROLE_ADMIN,ROLE_ANONYMOUS" />
+	</security:http>
+</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml
new file mode 100644
index 000000000..7a052199e
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+
+	<bean id="urlMapping"
+		class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="mappings">
+			<props>
+				<prop key="*">osgiServiceController</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="osgiServiceController"
+		class="org.springframework.web.servlet.mvc.ServletWrappingController">
+		<property name="servletClass">
+			<value>org.eclipse.equinox.http.servlet.HttpServiceServlet</value>
+		</property>
+		<property name="servletName">
+			<value>osgiService</value>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..16388e449
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
+
+	<display-name>Argeo OSGi Webapp</display-name>
+
+	<!-- General -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<display-name>Spring Context</display-name>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+	</context-param>
+
+	<!-- OSGi Http Service -->
+	<servlet>
+		<servlet-name>service</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>service</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- Security -->
+<!--	<filter>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>-->
+<!--	</filter>-->
+<!---->
+<!--	<filter-mapping>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<url-pattern>/*</url-pattern>-->
+<!--	</filter-mapping>-->
+
+</web-app>
diff --git a/server/modules/org.argeo.server.osgi.webapp/build.properties b/server/modules/org.argeo.server.osgi.webapp/build.properties
new file mode 100644
index 000000000..29dea25a4
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               WEB-INF/