From commits-return-23617-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Nov 12 22:29:18 2009 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 15381 invoked from network); 12 Nov 2009 22:29:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Nov 2009 22:29:18 -0000 Received: (qmail 32849 invoked by uid 500); 12 Nov 2009 22:29:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32795 invoked by uid 500); 12 Nov 2009 22:29:17 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 32762 invoked by uid 99); 12 Nov 2009 22:29:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2009 22:29:17 +0000 X-ASF-Spam-Status: No, hits=-3.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2009 22:29:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6B10423888D8; Thu, 12 Nov 2009 22:28:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r835609 - in /directory/samples/trunk/apacheds-archetype-webapp: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/java/ src/site/apt/ Date: Thu, 12 Nov 2009 22:28:54 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091112222854.6B10423888D8@eris.apache.org> Author: seelmann Date: Thu Nov 12 22:28:53 2009 New Revision: 835609 URL: http://svn.apache.org/viewvc?rev=835609&view=rev Log: o Update artifact name and urls o Update to ApacheDS 1.5.5 and Jetty 6.1.21 o Set archetype version to 1.5.5-SNAPSHOT to indicate that is works with ApacheDS 1.5.5 only Modified: directory/samples/trunk/apacheds-archetype-webapp/archetype-catalog.xml directory/samples/trunk/apacheds-archetype-webapp/pom.xml directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype.xml directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/pom.xml directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/RootDseServlet.java directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/StartStopListener.java directory/samples/trunk/apacheds-archetype-webapp/src/site/apt/index.apt Modified: directory/samples/trunk/apacheds-archetype-webapp/archetype-catalog.xml URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/archetype-catalog.xml?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/archetype-catalog.xml (original) +++ directory/samples/trunk/apacheds-archetype-webapp/archetype-catalog.xml Thu Nov 12 22:28:53 2009 @@ -25,12 +25,12 @@ org.apache.directory.samples - apacheds-webapp - 1.0-SNAPSHOT + apacheds-archetype-webapp + 1.5.5-SNAPSHOT Creates ApacheDS as an embedded Web Application - \ No newline at end of file + Modified: directory/samples/trunk/apacheds-archetype-webapp/pom.xml URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/pom.xml?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/pom.xml (original) +++ directory/samples/trunk/apacheds-archetype-webapp/pom.xml Thu Nov 12 22:28:53 2009 @@ -28,10 +28,11 @@ org.apache.directory.samples - apacheds-webapp + apacheds-archetype-webapp maven-archetype - Archetype to embed ApacheDS as a Web Application - 1.0-SNAPSHOT + ApacheDS Archetype Web Application + Archetype to embed ApacheDS as a Web Application + 1.5.5-SNAPSHOT 2.0.9 @@ -45,9 +46,9 @@ - scm:svn:http://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-webapp/ - scm:svn:https://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-webapp/ - https://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-webapp/ + scm:svn:http://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-archetype-webapp/ + scm:svn:https://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-archetype-webapp/ + https://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/ @@ -58,7 +59,7 @@ - scpexe://people.apache.org/www/directory.apache.org/samples/apacheds-webapp/gen-docs/${version}/ + scpexe://people.apache.org/www/directory.apache.org/samples/apacheds-archetype-webapp/gen-docs/${version}/ 1.0.0 @@ -67,13 +68,13 @@ org.apache.maven.archetype archetype-packaging - 2.0-alpha-3 + 2.0-alpha-4 maven-archetype-plugin - 2.0-alpha-3 + 2.0-alpha-4 true Modified: directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml Thu Nov 12 22:28:53 2009 @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + org.example Modified: directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype.xml URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype.xml?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype.xml (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/META-INF/maven/archetype.xml Thu Nov 12 22:28:53 2009 @@ -18,7 +18,7 @@ under the License. --> - apacheds-webapp + apacheds-archetype-webapp src/main/java/RootDseServlet.java src/main/java/StartStopListener.java Modified: directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/pom.xml Thu Nov 12 22:28:53 2009 @@ -47,7 +47,7 @@ maven-jetty-plugin org.mortbay.jetty - 6.1.10 + 6.1.21 /ApacheDS @@ -63,153 +63,13 @@ org.apache.directory.server - apacheds-bootstrap-extract - 1.5.4 - - - org.apache.directory.server - apacheds-bootstrap-partition - 1.5.4 - - - org.apache.directory.server - apacheds-core - 1.5.4 - - - org.apache.directory.server - apacheds-core-avl - 1.5.4 - - - org.apache.directory.server - apacheds-core-cursor - 1.5.4 - - - org.apache.directory.server - apacheds-core-entry - 1.5.4 - - - org.apache.directory.server - apacheds-core-jndi - 1.5.4 - - - org.apache.directory.server - apacheds-core-shared - 1.5.4 - - - org.apache.directory.server - apacheds-jdbm - 1.5.4 - - - org.apache.directory.server - apacheds-jdbm-store - 1.5.4 - - - org.apache.directory.server apacheds-protocol-ldap - 1.5.4 - - - org.apache.directory.server - apacheds-protocol-shared - 1.5.4 - - - org.apache.directory.server - apacheds-schema-bootstrap - 1.5.4 - - - org.apache.directory.server - apacheds-schema-registries - 1.5.4 - - - org.apache.directory.server - apacheds-utils - 1.5.4 - - - org.apache.directory.server - apacheds-xdbm-base - 1.5.4 - - - org.apache.directory.server - apacheds-xdbm-search - 1.5.4 - - - commons-collections - commons-collections - 3.2.1 - - - commons-lang - commons-lang - 2.4 - - - log4j - log4j - 1.2.14 - - - org.apache.mina - mina-core - 1.1.7 - - - org.apache.mina - mina-filter-ssl - 1.1.7 - - - org.apache.directory.shared - shared-asn1 - 0.9.12 - - - org.apache.directory.shared - shared-asn1-codec - 0.9.12 - - - org.apache.directory.shared - shared-bouncycastle-reduced - 0.9.12 - - - org.apache.directory.shared - shared-ldap - 0.9.12 - - - org.apache.directory.shared - shared-ldap-constants - 0.9.12 - - - org.slf4j - slf4j-api - 1.5.2 + 1.5.5 org.slf4j slf4j-log4j12 - 1.5.2 - - - antlr - antlr - 2.7.7 + 1.5.6 servlet-api Modified: directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/RootDseServlet.java URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/RootDseServlet.java?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/RootDseServlet.java (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/RootDseServlet.java Thu Nov 12 22:28:53 2009 @@ -19,6 +19,7 @@ */ package ${package}; + import java.io.PrintWriter; import java.util.Hashtable; @@ -39,73 +40,81 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.jndi.CoreContextFactory; + /** * A servlet which displays the Root DSE of the embedded server. * * @author Apache Directory * Project */ -public class RootDseServlet extends HttpServlet { +public class RootDseServlet extends HttpServlet +{ private static final long serialVersionUID = 1L; - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException { - try { - resp.setContentType("text/plain"); + protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException + { + try + { + resp.setContentType( "text/plain" ); PrintWriter out = resp.getWriter(); - out.println("*** ApacheDS RootDSE ***\n"); + out.println( "*** ApacheDS RootDSE ***\n" ); - DirContext ctx = new InitialDirContext(this.createEnv()); + DirContext ctx = new InitialDirContext( this.createEnv() ); SearchControls ctls = new SearchControls(); - ctls.setReturningAttributes(new String[] { "*", "+" }); - ctls.setSearchScope(SearchControls.OBJECT_SCOPE); - - NamingEnumeration result = ctx.search("", - "(objectClass=*)", ctls); - if (result.hasMore()) { + ctls.setReturningAttributes( new String[] + { "*", "+" } ); + ctls.setSearchScope( SearchControls.OBJECT_SCOPE ); + + NamingEnumeration result = ctx.search( "", "(objectClass=*)", ctls ); + if ( result.hasMore() ) + { SearchResult entry = result.next(); Attributes as = entry.getAttributes(); NamingEnumeration ids = as.getIDs(); - while (ids.hasMore()) { + while ( ids.hasMore() ) + { String id = ids.next(); - Attribute attr = as.get(id); - for (int i = 0; i < attr.size(); ++i) { - out.println(id + ": " + attr.get(i)); + Attribute attr = as.get( id ); + for ( int i = 0; i < attr.size(); ++i ) + { + out.println( id + ": " + attr.get( i ) ); } } } ctx.close(); out.flush(); - } catch (Exception e) { - throw new ServletException(e); + } + catch ( Exception e ) + { + throw new ServletException( e ); } } + /** * Creates an environment configuration for JNDI access. */ - protected Hashtable createEnv() { - + protected Hashtable createEnv() + { // Fetch directory service from servlet context ServletContext servletContext = this.getServletContext(); - DirectoryService directoryService = (DirectoryService) servletContext - .getAttribute(DirectoryService.JNDI_KEY); + DirectoryService directoryService = ( DirectoryService ) servletContext + .getAttribute( DirectoryService.JNDI_KEY ); Hashtable env = new Hashtable(); - env.put(DirectoryService.JNDI_KEY, directoryService); - env.put(Context.PROVIDER_URL, ""); - env.put(Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class - .getName()); - - env.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system"); - env.put(Context.SECURITY_CREDENTIALS, "secret"); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); + env.put( DirectoryService.JNDI_KEY, directoryService ); + env.put( Context.PROVIDER_URL, "" ); + env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() ); + + env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" ); + env.put( Context.SECURITY_CREDENTIALS, "secret" ); + env.put( Context.SECURITY_AUTHENTICATION, "simple" ); return env; } Modified: directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/StartStopListener.java URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/StartStopListener.java?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/StartStopListener.java (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/main/resources/archetype-resources/src/main/java/StartStopListener.java Thu Nov 12 22:28:53 2009 @@ -19,6 +19,7 @@ */ package ${package}; + import java.io.File; import javax.servlet.ServletContext; @@ -27,8 +28,9 @@ import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.ldap.LdapService; -import org.apache.directory.server.protocol.shared.SocketAcceptor; +import org.apache.directory.server.ldap.LdapServer; +import org.apache.directory.server.protocol.shared.transport.TcpTransport; + /** * A Servlet context listener to start and stop ApacheDS. @@ -36,57 +38,63 @@ * @author Apache Directory * Project */ -public class StartStopListener implements ServletContextListener { +public class StartStopListener implements ServletContextListener +{ private DirectoryService directoryService; - private SocketAcceptor socketAcceptor; - private LdapService ldapService; + private LdapServer ldapServer; + /** * Startup ApacheDS embedded. */ - public void contextInitialized(ServletContextEvent evt) { - - try { + public void contextInitialized( ServletContextEvent evt ) + { + try + { directoryService = new DefaultDirectoryService(); - directoryService.setShutdownHookEnabled(true); + directoryService.setShutdownHookEnabled( true ); - socketAcceptor = new SocketAcceptor(null); - ldapService = new LdapService(); - ldapService.setSocketAcceptor(socketAcceptor); - ldapService.setDirectoryService(directoryService); + ldapServer = new LdapServer(); + ldapServer.setDirectoryService( directoryService ); + ldapServer.setAllowAnonymousAccess( true ); // Set LDAP port to 10389 - ldapService.setIpPort(10389); + TcpTransport ldapTransport = new TcpTransport( 10389 ); + ldapServer.setTransports( ldapTransport ); // Determine an appropriate working directory ServletContext servletContext = evt.getServletContext(); - File workingDir = (File) servletContext - .getAttribute("javax.servlet.context.tempdir"); - directoryService.setWorkingDirectory(workingDir); + File workingDir = ( File ) servletContext.getAttribute( "javax.servlet.context.tempdir" ); + directoryService.setWorkingDirectory( workingDir ); directoryService.startup(); - ldapService.start(); + ldapServer.start(); // Store directoryService in context to provide it to servlets etc. - servletContext.setAttribute(DirectoryService.JNDI_KEY, - directoryService); - - } catch (Exception e) { - throw new RuntimeException(e); + servletContext.setAttribute( DirectoryService.JNDI_KEY, directoryService ); + } + catch ( Exception e ) + { + throw new RuntimeException( e ); } } + /** * Shutdown ApacheDS embedded. */ - public void contextDestroyed(ServletContextEvent evt) { - try { - ldapService.stop(); + public void contextDestroyed( ServletContextEvent evt ) + { + try + { + ldapServer.stop(); directoryService.shutdown(); - } catch (Exception e) { - throw new RuntimeException(e); + } + catch ( Exception e ) + { + throw new RuntimeException( e ); } } } \ No newline at end of file Modified: directory/samples/trunk/apacheds-archetype-webapp/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/directory/samples/trunk/apacheds-archetype-webapp/src/site/apt/index.apt?rev=835609&r1=835608&r2=835609&view=diff ============================================================================== --- directory/samples/trunk/apacheds-archetype-webapp/src/site/apt/index.apt (original) +++ directory/samples/trunk/apacheds-archetype-webapp/src/site/apt/index.apt Thu Nov 12 22:28:53 2009 @@ -33,24 +33,41 @@ * Usage - Change to your preferred location to create the new project and execute following command: + To use the archetype you'll need to check it out and install it to your local repository: +--- -mvn archetype:generate \ - -DgroupId=org.example \ - -DartifactId=myProject \ - -Dversion=1.0-SNAPSHOT \ - -DarchetypeGroupId=org.apache.directory.samples \ - -DarchetypeArtifactId=apacheds-webapp \ - -DarchetypeVersion=1.0-SNAPSHOT \ - -DarchetypeRepository=http://vm094.oxylos.org/mirror-maven2/ -+--- - - or - -+--- -mvn archetype:generate -DarchetypeCatalog=http://directory.apache.org -DarchetypeRepository=http://vm094.oxylos.org/mirror-maven2/ -+--- +svn co http://svn.apache.org/repos/asf/directory/samples/trunk/apacheds-archetype-webapp +cd apacheds-archetype-webapp +mvn install ++--- + + Then change to your preferred location to create the new project and execute following command: + ++--- +mvn archetype:generate -DarchetypeGroupId=org.apache.directory.samples \ + -DarchetypeArtifactId=apacheds-archetype-webapp \ + -DarchetypeVersion=1.5.5-SNAPSHOT \ + -DgroupId=org.example -DartifactId=myProject -Dversion=1.0-SNAPSHOT ++--- +~~ +~~ Change to your preferred location to create the new project and execute following command: +~~ +~~+--- +~~mvn archetype:generate \ +~~ -DgroupId=org.example \ +~~ -DartifactId=myProject \ +~~ -Dversion=1.0-SNAPSHOT \ +~~ -DarchetypeGroupId=org.apache.directory.samples \ +~~ -DarchetypeArtifactId=apacheds-webapp \ +~~ -DarchetypeVersion=1.0-SNAPSHOT \ +~~ -DarchetypeRepository=http://vm094.oxylos.org/mirror-maven2/ +~~+--- +~~ +~~ or +~~ +~~+--- +~~mvn archetype:generate -DarchetypeCatalog=http://directory.apache.org -DarchetypeRepository=http://vm094.oxylos.org/mirror-maven2/ +~~+--- \ Then change to the created directory (myProject by default) and run the created webapp @@ -62,4 +79,4 @@ and point your browser to {{http://localhost:8080/ApacheDS/RootDse}}. - For more information see also the {{{http://cwiki.apache.org/confluence/display/DIRxSRVx11/Embedding+ApacheDS+as+a+Web+Application}wiki page}}. \ No newline at end of file + For more information see also the {{{http://directory.apache.org/apacheds/1.5/43-embedding-apacheds-as-a-web-application.html}wiki page}}.