You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2008/10/08 08:11:06 UTC

svn commit: r702728 - in /directory/sandbox/felixk/embed-apacheds-archetype: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/webapp/WEB-INF/

Author: felixk
Date: Tue Oct  7 23:11:03 2008
New Revision: 702728

URL: http://svn.apache.org/viewvc?rev=702728&view=rev
Log:
- Add some license headers
- some formatting

Modified:
    directory/sandbox/felixk/embed-apacheds-archetype/pom.xml
    directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
    directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype.xml
    directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/pom.xml
    directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Modified: directory/sandbox/felixk/embed-apacheds-archetype/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/embed-apacheds-archetype/pom.xml?rev=702728&r1=702727&r2=702728&view=diff
==============================================================================
--- directory/sandbox/felixk/embed-apacheds-archetype/pom.xml (original)
+++ directory/sandbox/felixk/embed-apacheds-archetype/pom.xml Tue Oct  7 23:11:03 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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>
   <groupId>org.apache.directory</groupId>
   <artifactId>embed-apacheds-archetype</artifactId>

Modified: directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=702728&r1=702727&r2=702728&view=diff
==============================================================================
--- directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Tue Oct  7 23:11:03 2008
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor name="embedded-apacheds">
+<!--
+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.
+-->
+<archetype-descriptor name="embed-apacheds">
   <fileSets>
     <fileSet filtered="true" packaged="true" encoding="UTF-8">
       <directory>src/main/java</directory>

Modified: directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=702728&r1=702727&r2=702728&view=diff
==============================================================================
--- directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/META-INF/maven/archetype.xml Tue Oct  7 23:11:03 2008
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?><archetype>
-  <id>embedded-apacheds</id>
+<!--
+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.
+-->
+  <id>embed-apacheds</id>
   <sources>
     <source>src/main/java/RootDseServlet.java</source>
     <source>src/main/java/StartStopListener.java</source>

Modified: directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/pom.xml?rev=702728&r1=702727&r2=702728&view=diff
==============================================================================
--- directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/pom.xml Tue Oct  7 23:11:03 2008
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+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>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <packaging>war</packaging>
   <version>${version}</version>
-  <name>Embedded ApacheDS as a Web Application</name>
+  <name>Embed ApacheDS as a Web Application</name>
   <url>http://maven.apache.org</url>
   
   <build>
@@ -23,193 +43,161 @@
   </build>
   
   <dependencies>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-extract</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-bootstrap-partition</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-avl</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-cursor</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-entry</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-jndi</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-store</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-bootstrap</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-schema-registries</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-utils</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-base</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-xdbm-search</artifactId>
       <version>1.5.4</version>
     </dependency>
-
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>3.2.1</version>
     </dependency>
-
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.4</version>
     </dependency>
-
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.14</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
       <version>1.1.7</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
       <version>1.1.7</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1</artifactId>
       <version>0.9.12</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
       <version>0.9.12</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-bouncycastle-reduced</artifactId>
       <version>0.9.12</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
       <version>0.9.12</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-constants</artifactId>
       <version>0.9.12</version>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>1.5.2</version>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <version>1.5.2</version>
     </dependency>
-
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
       <version>2.7.7</version>
     </dependency>
-    
     <dependency>
       <artifactId>servlet-api</artifactId>
       <groupId>javax.servlet</groupId>
       <version>2.5</version>
       <scope>provided</scope>
     </dependency>
-
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=702728&r1=702727&r2=702728&view=diff
==============================================================================
--- directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/felixk/embed-apacheds-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Tue Oct  7 23:11:03 2008
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-"http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
   <display-name>ApacheDS embedded in a WebApp</display-name>
   <description>
@@ -9,16 +26,12 @@
   </description>
 
   <listener>
-    <listener-class>
-      ${package}.StartStopListener
-    </listener-class>
+    <listener-class>${package}.StartStopListener</listener-class>
   </listener>
 
   <servlet>
     <servlet-name>RootDseServlet</servlet-name>
-    <servlet-class>
-      ${package}.RootDseServlet
-    </servlet-class>
+    <servlet-class>${package}.RootDseServlet</servlet-class>
   </servlet>
 
    <servlet-mapping>