You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ak...@apache.org on 2008/01/26 20:55:45 UTC

svn commit: r615479 - in /mina/asyncweb/trunk: assembly/pom.xml client/pom.xml codec/pom.xml examples/pom.xml pom.xml server/pom.xml spring/pom.xml

Author: akarasulu
Date: Sat Jan 26 11:55:43 2008
New Revision: 615479

URL: http://svn.apache.org/viewvc?rev=615479&view=rev
Log:
got build working again - might have some hickups that need fixin

Modified:
    mina/asyncweb/trunk/assembly/pom.xml
    mina/asyncweb/trunk/client/pom.xml
    mina/asyncweb/trunk/codec/pom.xml
    mina/asyncweb/trunk/examples/pom.xml
    mina/asyncweb/trunk/pom.xml
    mina/asyncweb/trunk/server/pom.xml
    mina/asyncweb/trunk/spring/pom.xml

Modified: mina/asyncweb/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/assembly/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/assembly/pom.xml (original)
+++ mina/asyncweb/trunk/assembly/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,45 +1,64 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0"?>
+<!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+-->
+<project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.asyncweb</groupId>
-    <artifactId>asyncweb</artifactId>
+    <groupId>org.apache.asyncweb</groupId>
+    <artifactId>build</artifactId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>asyncweb-assembly</artifactId>
   <packaging>jar</packaging>
-  <name>AsyncWeb Assembly</name>
+  <name>Apache AsyncWeb Assembly</name>
 
   <build>
     <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/descriptor/withdeps.xml</descriptor>
-                <descriptor>src/main/descriptor/release.xml</descriptor>
-              </descriptors>
-              <finalName>asyncweb-${pom.version}</finalName>
-              <includeSite>false</includeSite>
-            </configuration>
-          </plugin>
-      </plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/descriptor/withdeps.xml</descriptor>
+            <descriptor>src/main/descriptor/release.xml</descriptor>
+          </descriptors>
+          <finalName>asyncweb-${pom.version}</finalName>
+          <includeSite>false</includeSite>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>asyncweb-core</artifactId>
-      <scope>compile</scope>
+      <artifactId>asyncweb-server</artifactId>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>asyncweb-springframework</artifactId>
-      <scope>compile</scope>
+      <artifactId>asyncweb-spring</artifactId>
     </dependency>
+
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>asyncweb-example</artifactId>
-      <scope>compile</scope>
+      <artifactId>asyncweb-examples</artifactId>
     </dependency>
   </dependencies>
+
 </project>

Modified: mina/asyncweb/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/pom.xml (original)
+++ mina/asyncweb/trunk/client/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,77 +1,95 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>build</artifactId>
-    <groupId>org.apache.mina</groupId>
-    <version>2.0.0-M1-SNAPSHOT</version>
+    <groupId>org.apache.asyncweb</groupId>
+    <version>0.9.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>mina-protocol-http-client</artifactId>
-  <name>Apache MINA HTTP Client</name>
+  <artifactId>asyncweb-client</artifactId>
+  <name>Apache Asyncweb Client</name>
   <packaging>bundle</packaging>  
+
   <properties>
-    <exportedPackage>${groupId}.protocol.http.client</exportedPackage>
+    <!-- correct this after refactoring package names -->
+    <!-- exportedPackage>${groupId}.protocol.http.client</exportedPackage -->
+    <exportedPackage>org.apache.mina.protocol.http.client</exportedPackage>
   </properties>
+
   <dependencies>
     <dependency>
       <groupId>${groupId}</groupId>
-      <artifactId>mina-core</artifactId>
+      <artifactId>asyncweb-codec</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>${groupId}</groupId>
-      <artifactId>mina-filter-codec-http</artifactId>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
+
+    <!-- ======================= -->
+    <!-- TEST Scope Dependencies -->
+    <!-- ======================= -->
+
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>catalina</artifactId>
       <version>6.0.13</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>coyote</artifactId>
       <version>6.0.13</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>servlet-api</artifactId>
       <version>6.0.13</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat.extras</groupId>
       <artifactId>juli-adapters</artifactId>
       <version>6.0.13</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>jasper</artifactId>
       <version>6.0.13</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>jasper-jdt</artifactId>
@@ -79,6 +97,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: mina/asyncweb/trunk/codec/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/codec/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/codec/pom.xml (original)
+++ mina/asyncweb/trunk/codec/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,22 +1,44 @@
 <?xml version="1.0"?>
+<!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
+-->
 <project>
   <parent>
     <artifactId>build</artifactId>
-    <groupId>org.apache.mina</groupId>
-    <version>2.0.0-M1-SNAPSHOT</version>
+    <groupId>org.apache.asyncweb</groupId>
+    <version>0.9.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>mina-filter-codec-http</artifactId>
-  <name>Apache MINA HTTP Codec</name>
+  <artifactId>asyncweb-codec</artifactId>
+  <name>Apache Asyncweb Codec</name>
   <packaging>bundle</packaging>
+
   <properties>
-    <exportedPackage>${groupId}.filter.codec.http</exportedPackage>
+    <!-- exportedPackage>${groupId}.filter.codec.http</exportedPackage -->
+    <exportedPackage>org.apache.mina.filter.codec.http</exportedPackage>
   </properties>
+
   <dependencies>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>

Modified: mina/asyncweb/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/pom.xml (original)
+++ mina/asyncweb/trunk/examples/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 	Licensed to the Apache Software Foundation (ASF) under one
 	or more contributor license agreements.  See the NOTICE file
@@ -16,52 +17,48 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.safehaus.asyncweb</groupId>
-		<artifactId>asyncweb</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>asyncweb-example</artifactId>
-	<packaging>jar</packaging>
-	<name>AsyncWeb Examples</name>
+<project> 
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.asyncweb</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>asyncweb-examples</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache AsyncWeb Examples</name>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<configuration>
-					<tasks>
-						<java
-							classname="org.safehaus.asyncweb.integration.spring.Main"
-							fork="yes" failonerror="true">
-							<sysproperty key="asyncWeb.config"
-								value="." />
-							<sysproperty key="asyncWeb.config.services"
-								value="exampleHttpServiceDefinitions" />
-							<classpath refid="maven.compile.classpath" />
-							<classpath refid="maven.test.classpath" />
-						</java>
-					</tasks>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <configuration>
+          <tasks>
+            <java
+              classname="org.safehaus.asyncweb.integration.spring.Main"
+              fork="yes" failonerror="true">
+              <sysproperty key="asyncWeb.config" value="." />
+              <sysproperty key="asyncWeb.config.services"
+                           value="exampleHttpServiceDefinitions" />
+              <classpath refid="maven.compile.classpath" />
+              <classpath refid="maven.test.classpath" />
+            </java>
+          </tasks>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.safehaus.asyncweb</groupId>
-			<artifactId>asyncweb-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.safehaus.asyncweb</groupId>
-			<artifactId>asyncweb-springframework</artifactId>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>asyncweb-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>asyncweb-spring</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Modified: mina/asyncweb/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/pom.xml (original)
+++ mina/asyncweb/trunk/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,6 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<?xml version="1.0"?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache</groupId>
@@ -67,7 +66,6 @@
     <symbolicName>${exportedPackage}</symbolicName>
   </properties>
 
-  
   <developers>
       <developer>
           <id>akarasulu</id>
@@ -136,25 +134,82 @@
   </modules>
 
   <build>
-      <plugins>
-          <plugin>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                  <source>1.5</source>
-                  <target>1.5</target>
-              </configuration>
-          </plugin>
-          <plugin>
-              <artifactId>maven-release-plugin</artifactId>
-              <configuration>
-                  <tagBase>
-                      https://svn.safehaus.org/repos/asyncweb/tags
-                  </tagBase>
-              </configuration>
-          </plugin>
-      </plugins>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <source>1.5</source>
+          <target>1.5</target>
+          <debug>true</debug>
+          <optimize>true</optimize>
+          <showDeprecations>true</showDeprecations>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+            <exclude>**/*RegressionTest*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
+     <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-source-plugin</artifactId>
+       <executions>
+         <execution>
+           <id>attach-source</id>
+           <goals>
+             <goal>jar</goal>
+           </goals>
+         </execution>
+       </executions>
+     </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>release.xml</descriptor>
+          </descriptors>
+          <finalName>asyncweb-${pom.version}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <tagBase>
+            https://svn.apache.org/repos/asf/mina/asyncweb/tags
+          </tagBase>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.0.0</version>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${symbolicName}</Bundle-SymbolicName>
+            <Export-Package>${exportedPackage}.*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
+
   <dependencyManagement>
     <dependencies>
 
@@ -163,31 +218,31 @@
       <!-- ======= -->
 
       <dependency>
-        <groupId>org.safehaus.asyncweb</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>asyncweb-server</artifactId>
         <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.safehaus.asyncweb</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>asyncweb-spring</artifactId>
         <version>${pom.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.safehaus.asyncweb</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>asyncweb-examples</artifactId>
         <version>${pom.version}</version>
       </dependency>
 
        <dependency>
-        <groupId>org.apache.asyncweb</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>asyncweb-codec</artifactId>
         <version>${pom.version}</version>
       </dependency>
 
        <dependency>
-        <groupId>org.apache.asyncweb</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>asyncweb-client</artifactId>
         <version>${pom.version}</version>
       </dependency>

Modified: mina/asyncweb/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/pom.xml (original)
+++ mina/asyncweb/trunk/server/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 	Licensed to the Apache Software Foundation (ASF) under one
 	or more contributor license agreements.  See the NOTICE file
@@ -16,34 +17,32 @@
 	specific language governing permissions and limitations
 	under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.safehaus.asyncweb</groupId>
-		<artifactId>asyncweb</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>asyncweb-core</artifactId>
-	<packaging>jar</packaging>
-	<name>AsyncWeb Core</name>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.asyncweb</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>asyncweb-server</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Asyncweb Server</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>concurrent</groupId>
-			<artifactId>concurrent</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.mina</groupId>
-			<artifactId>mina-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.mina</groupId>
-			<artifactId>mina-filter-codec-http</artifactId>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <!-- don't think this concurrent dependency is needed anymore -->
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>asyncweb-codec</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Modified: mina/asyncweb/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/spring/pom.xml?rev=615479&r1=615478&r2=615479&view=diff
==============================================================================
--- mina/asyncweb/trunk/spring/pom.xml (original)
+++ mina/asyncweb/trunk/spring/pom.xml Sat Jan 26 11:55:43 2008
@@ -1,54 +1,52 @@
-<!-- 
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+        Licensed to the Apache Software Foundation (ASF) under one
+        or more contributor license agreements.  See the NOTICE file
+        distributed with this work for additional information
+        regarding copyright ownership.  The ASF licenses this file
+        to you under the Apache License, Version 2.0 (the
+        "License"); you may not use this file except in compliance
+        with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing,
+        software distributed under the License is distributed on an
+        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+        KIND, either express or implied.  See the License for the
+        specific language governing permissions and limitations
+        under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.safehaus.asyncweb</groupId>
-		<artifactId>asyncweb</artifactId>
-		<version>0.9.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>asyncweb-springframework</artifactId>
-	<packaging>jar</packaging>
-	<name>AsyncWeb Springframework Integration</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.safehaus.asyncweb</groupId>
-			<artifactId>asyncweb-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.asyncweb</groupId>
+    <artifactId>build</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>asyncweb-spring</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache AsyncWeb Spring Integration</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${groupId}</groupId>
+      <artifactId>asyncweb-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+  </dependencies>
 </project>