directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r570930 [2/4] - in /directory/sandbox/akarasulu: refactoring-apacheds-trunk/ refactoring-apacheds-trunk/benchmarks/ refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/ refactoring-apacheds-trunk/core-unit/src/test/java/org/apach...
Date Wed, 29 Aug 2007 20:55:29 GMT
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java Wed Aug 29 13:55:22 2007
@@ -22,15 +22,25 @@
 package org.apache.directory.server.ldap.support.extended;
 
 
+import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
+import javax.naming.directory.Attributes;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.commons.lang.SerializationUtils;
 import org.apache.directory.server.core.jndi.ServerLdapContext;
+import org.apache.directory.server.core.sp.StoredProcEngine;
+import org.apache.directory.server.core.sp.StoredProcEngineConfig;
+import org.apache.directory.server.core.sp.StoredProcExecutionManager;
+import org.apache.directory.server.core.sp.java.JavaStoredProcEngineConfig;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapProtocolProvider;
 import org.apache.directory.server.ldap.SessionRegistry;
@@ -39,10 +49,13 @@
 import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedure;
 import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedureContainer;
 import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedureDecoder;
+import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedure.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
+import org.apache.directory.shared.ldap.sp.LdapContextParameter;
+import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.common.IoSession;
 
 
@@ -52,42 +65,61 @@
  */
 public class StoredProcedureExtendedOperationHandler implements ExtendedOperationHandler
 {
+    private StoredProcExecutionManager manager;
+    private static final Object[] EMPTY_CLASS_ARRAY = new Object[0];
+    public StoredProcedureExtendedOperationHandler()
+    {
+        super();
+        //StoredProcEngineConfig javaxScriptSPEngineConfig = new JavaxStoredProcEngineConfig();
+        StoredProcEngineConfig javaSPEngineConfig = new JavaStoredProcEngineConfig();
+        List<StoredProcEngineConfig> spEngineConfigs = new ArrayList<StoredProcEngineConfig>();
+        //spEngineConfigs.add( javaxScriptSPEngineConfig );
+        spEngineConfigs.add( javaSPEngineConfig );
+        String spContainer = "ou=Stored Procedures,ou=system";
+        this.manager = new StoredProcExecutionManager( spContainer, spEngineConfigs );
+    }
+
     public void handleExtendedOperation( IoSession session, SessionRegistry registry, ExtendedRequest req ) throws Exception
     {
         Control[] connCtls = req.getControls().values().toArray( new Control[ req.getControls().size() ] );
         LdapContext ldapContext = registry.getLdapContext( session, connCtls, false);
-        ServerLdapContext serverLdapContext;
+        ServerLdapContext ctx;
         
         if ( ldapContext instanceof ServerLdapContext )
         {
-            serverLdapContext = ( ServerLdapContext ) ldapContext;
+            ctx = ( ServerLdapContext ) ldapContext;
         }
         else
         {
-            serverLdapContext = ( ServerLdapContext ) ldapContext.lookup( "" );
+            ctx = ( ServerLdapContext ) ldapContext.lookup( "" );
         }
         
         StoredProcedure spBean = decodeBean( req.getPayload() );
         
-        LanguageSpecificStoredProceureExtendedOperationHandler handler = null;
-        
-        byte[] responseStream = null;
-        
-        /**
-         * TODO This part may be replaced by a better handler determiner.
-         */
-        if ( spBean.getLanguage().equalsIgnoreCase( "Java" ) )
+        String procedure = StringTools.utf8ToString( spBean.getProcedure() );
+        Attributes spUnit = manager.findStoredProcUnit( ctx, procedure );
+        StoredProcEngine engine = manager.getStoredProcEngineInstance( spUnit );
+        
+        List valueList = new ArrayList( spBean.getParameters().size() );
+        Iterator<StoredProcedureParameter> it = spBean.getParameters().iterator();
+        while ( it.hasNext() )
         {
-            handler = new JavaStoredProcedureExtendedOperationHandler();
-            responseStream = handler.handleStoredProcedureExtendedOperation( serverLdapContext, spBean );
+            StoredProcedureParameter pPojo = it.next();
+            byte[] serializedValue = pPojo.getValue();
+            Object value = SerializationUtils.deserialize( serializedValue );
+            if ( value.getClass().equals( LdapContextParameter.class ) )
+            {
+                String paramCtx = ( ( LdapContextParameter ) value ).getValue();
+                value = ctx.lookup( paramCtx );
+            }
+            valueList.add( value );
         }
+        Object[] values = valueList.toArray( EMPTY_CLASS_ARRAY );
         
-        /**
-         * FIXME: We may have issues sending SP result back to the client.
-         */
-        
-        ( ( ExtendedResponse )( req.getResultResponse() ) ).setResponse( responseStream );
+        Object response = engine.invokeProcedure( ctx, procedure, values );
         
+        byte[] serializedResponse = SerializationUtils.serialize( ( Serializable ) response );
+        ( ( ExtendedResponse )( req.getResultResponse() ) ).setResponse( serializedResponse );
         session.write( req.getResultResponse() );
         
     }

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ntp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ntp/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ntp/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ntp/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+#    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.
+#############################################################################
 log4j.rootCategory=OFF, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/configuration-dns.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/configuration-dns.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/configuration-dns.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/configuration-dns.ldif Wed Aug 29 13:55:22 2007
@@ -1,25 +1,25 @@
-#
-#  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. 
-#
-#   EXAMPLE.COM is reserved for testing according to this RFC:
-#
-#   http://www.rfc-editor.org/rfc/rfc2606.txt
-#
+#
+#  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. 
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
 
 version: 1
 dn: ou=configuration,ou=system
@@ -38,46 +38,46 @@
 cn: dns
 apacheServicePid: org.apache.dns.factory
 
-dn: cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
+dn: cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
 objectClass: apacheServiceConfiguration
-objectClass: extensibleObject
+objectClass: extensibleObject
 cn: org.apache.dns.1
 ipAddress: 192.168.0.1
 ipPort: 53
 baseDn: dc=example,dc=com
 apacheServicePid: org.apache.dns.1
-apacheServiceFactoryPid: org.apache.dns.factory
-
-dn: ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
-objectClass: top
-objectClass: organizationalUnit
-ou: catalog
-
-dn: cn=example.com,ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
-objectClass: top
-objectClass: apacheCatalogEntry
-cn: example.com
-apacheCatalogEntryName: example.com
-apacheCatalogEntryBaseDn: ou=zones,dc=example,dc=com
+apacheServiceFactoryPid: org.apache.dns.factory
+
+dn: ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
+objectClass: top
+objectClass: organizationalUnit
+ou: catalog
+
+dn: cn=example.com,ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system
+objectClass: top
+objectClass: apacheCatalogEntry
+cn: example.com
+apacheCatalogEntryName: example.com
+apacheCatalogEntryBaseDn: ou=zones,dc=example,dc=com
 
 dn: cn=org.apache.dns.2,cn=dns,ou=services,ou=configuration,ou=system
-objectClass: apacheServiceConfiguration
+objectClass: apacheServiceConfiguration
 objectClass: extensibleObject
-cn: org.apache.dns.2
+cn: org.apache.dns.2
 ipAddress:  10.0.0.1
 ipPort: 10000
 baseDn: dc=apache,dc=org
 apacheServicePid: org.apache.dns.2
 apacheServiceFactoryPid: org.apache.dns.factory
-
-dn: ou=catalog,cn=org.apache.dns.2,cn=dns,ou=services,ou=configuration,ou=system
-objectClass: top
-objectClass: organizationalUnit
-ou: catalog
-
-dn: cn=apache.org,ou=catalog,cn=org.apache.dns.2,cn=dns,ou=services,ou=configuration,ou=system
-objectClass: top
-objectClass: apacheCatalogEntry
-cn: apache.org
-apacheCatalogEntryName: apache.org
-apacheCatalogEntryBaseDn: ou=zones,dc=apache,dc=org
+
+dn: ou=catalog,cn=org.apache.dns.2,cn=dns,ou=services,ou=configuration,ou=system
+objectClass: top
+objectClass: organizationalUnit
+ou: catalog
+
+dn: cn=apache.org,ou=catalog,cn=org.apache.dns.2,cn=dns,ou=services,ou=configuration,ou=system
+objectClass: top
+objectClass: apacheCatalogEntry
+cn: apache.org
+apacheCatalogEntryName: apache.org
+apacheCatalogEntryBaseDn: ou=zones,dc=apache,dc=org

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+#    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.
+#############################################################################
 # Set root logger level to DEBUG and its only appender to A1.
 log4j.rootLogger=INFO, A1
 

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/sar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/sar-plugin/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/sar-plugin/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/sar-plugin/pom.xml Wed Aug 29 13:55:22 2007
@@ -1,3 +1,21 @@
+<?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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
 <project>
   <parent>
     <groupId>org.apache.directory.server</groupId>

Propchange: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 29 13:55:22 2007
@@ -8,3 +8,4 @@
 *.ipr
 *.log
 target
+ApacheDirectoryStudio.zip

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/pom.xml Wed Aug 29 13:55:22 2007
@@ -1,4 +1,21 @@
 <?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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -74,14 +91,15 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>tanukisoft</groupId>
+      <artifactId>wrapper</artifactId>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
-      <groupId>commons-daemon</groupId>
-      <artifactId>commons-daemon</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
@@ -112,7 +130,6 @@
 
   <build>
     <plugins>
-<!--
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -121,12 +138,12 @@
             <configuration>
               <tasks>
                 <mkdir dir="target/images"/>
-                <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip"
+                <get src="http://builds.organicelement.com/repository/download/bt4/.lastSuccessful/ApacheDirectoryStudio_Windows.zip?guest=1"
                      verbose="on" usetimestamp="true"
-                     dest="target/ApacheDirectoryStudio.zip"
+                     dest="ApacheDirectoryStudio.zip"
                 />
-                <touch file="target/ApacheDirectoryStudio.zip"/>
-                <unzip src="target/ApacheDirectoryStudio.zip" dest="target/images/win32" overwrite="false" />
+                <touch file="ApacheDirectoryStudio.zip"/>
+                <unzip src="ApacheDirectoryStudio.zip" dest="target/images/win32" overwrite="false" />
               </tasks>
             </configuration>
             <goals>
@@ -135,7 +152,6 @@
           </execution>
         </executions>
       </plugin>
--->
       <plugin>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-plugin</artifactId>
@@ -251,7 +267,7 @@
                     <filtered>false</filtered>
                   </packagedFile>
                 </packagedFiles>
-                <id>apacheds-rpm</id>
+                <id>apacheds-i386-rpm</id>
                 <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
                 <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
                 <finalName>
@@ -264,6 +280,53 @@
                 <scriptFile>src/main/installers/apacheds-init</scriptFile>
                 <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
               </rpmTarget>
+              <rpmTarget>
+                <packagedFiles>
+                  <packagedFile>
+                    <source>rpm-apacheds-tools.sh</source>
+                    <destinationPath>bin/apacheds-tools.sh</destinationPath>
+                    <installationBundleId>Binaries</installationBundleId>
+                    <executable>true</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-fhs.conf</source>
+                    <destinationPath>conf/apacheds.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-sysconfig.conf</source>
+                    <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-default.conf</source>
+                    <destinationPath>conf/apacheds-default.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>false</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>../resources/adstree.ico</source>
+                    <destinationPath>logo.ico</destinationPath>
+                    <executable>false</executable>
+                    <filtered>false</filtered>
+                  </packagedFile>
+                </packagedFiles>
+                <id>apacheds-x86_64-rpm</id>
+                <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
+                <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
+                <finalName>
+                  apacheds-server-${pom.version}-x86_64.rpm
+                </finalName>
+                <osName>Linux</osName>
+                <osFamily>unix</osFamily>
+                <osArch>x86_64</osArch>
+                <daemonFramework>tanuki</daemonFramework>
+                <scriptFile>src/main/installers/apacheds-init</scriptFile>
+                <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
+              </rpmTarget>
           </rpmTargets>
 
           <nsisTargets>
@@ -282,8 +345,8 @@
                   <filtered>true</filtered>
                 </packagedFile>
                 <packagedFile>
-                  <source>../resources/adstree.ico</source>
-                  <destinationPath>server.ico</destinationPath>
+                  <source>../resources/server-installer.ico</source>
+                  <destinationPath>server-installer.ico</destinationPath>
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>
@@ -301,7 +364,6 @@
               <osArch>x86</osArch>
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
-<!--
             <nsisTarget>
               <packagedFiles>
                 <packagedFile>
@@ -317,15 +379,15 @@
                   <filtered>true</filtered>
                 </packagedFile>
                 <packagedFile>
-                  <source>../resources/adstree.ico</source>
-                  <destinationPath>server.ico</destinationPath>
+                  <source>../resources/suite-installer.ico</source>
+                  <destinationPath>suite-installer.ico</destinationPath>
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>
               </packagedFiles>
 
               <id>win32</id>
-              <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
+              <nsisCompiler>/usr/local/nsis/makensis</nsisCompiler>
               <nsisConfigurationFile>src/main/installers/apacheds-suite-win.nsi</nsisConfigurationFile>
               <finalName>
                 apacheds-suite-${pom.version}-setup
@@ -336,7 +398,6 @@
               <osArch>x86</osArch>
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
--->
           </nsisTargets>
 
         </configuration>

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-default.conf
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-default.conf?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-default.conf (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-default.conf Wed Aug 29 13:55:22 2007
@@ -1,3 +1,23 @@
+#
+#  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.
+#
+  
+#
 # In this file you can override parameters specified in the default
 # Apache Directory Server config file which is usually at
 # /opt/apacheds-x.x.x/conf/apacheds.conf

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-fhs.conf
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-fhs.conf?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-fhs.conf (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-fhs.conf Wed Aug 29 13:55:22 2007
@@ -1,14 +1,30 @@
-#********************************************************************
-# TestWrapper Properties
 #
-# NOTE - Please use src/conf/apacheds.conf.in as a template for your
-#        own application rather than the values used for the
-#        TestWrapper sample.
-#********************************************************************
-# Java Application
-#wrapper.java.command=%JAVA_HOME%/bin/java
+#  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.
+#
 
 #include /etc/apacheds/%INSTANCE%.conf
+
+# If the default java executable is not on the path,
+# this will need to be set to a fully qualified path.
+# This can also be overridden in /var/lib/apacheds/<instance_name>/conf/apacheds.conf
+#
+#wrapper.java.command=/usr/local/java/jdk1.5.0_10/bin/java
+#
 wrapper.java.command=@app.java.home@
 
 # Java Main class.  This class must implement the WrapperListener interface
@@ -16,7 +32,6 @@
 #  classes are provided to do this for you.  See the Integration section
 #  of the documentation for details.
 wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper
-#wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 wrapper.max_failed_invocations=1
 
 wrapper.java.classpath.1=../lib/bootstrapper.jar

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-init
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-init?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-init (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-init Wed Aug 29 13:55:22 2007
@@ -1,5 +1,24 @@
 #! /bin/sh
 #
+#
+#  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.
+#
+
 # Shell script to start/stop Apache Directory Server
 # If you want to change apacheds service settings please modify the apacheds.conf 
 # file for the instance you wish to change.

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-rpm.spec
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-rpm.spec?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-rpm.spec (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-rpm.spec Wed Aug 29 13:55:22 2007
@@ -1,4 +1,23 @@
-Summary: ${app.display.name} Server 
+#
+#  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.
+#
+
+Summary: ${app.display.name} Server
 Name: ${app}
 Version: ${app.version}
 Release: ${app.release}

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-server-win.nsi
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-server-win.nsi?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-server-win.nsi (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-server-win.nsi Wed Aug 29 13:55:22 2007
@@ -1,8 +1,27 @@
+#
+#  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.
+#
+
 !define AppName "${app.description}"
 !define AppVersion "${app.version}"
 !define OutFile "${app.final.name}"
 !define ShortName "${app}"
-!define SourceDir "${app.base.dir}/src"
+!define SourceDir "${app.base.dir}\src"
 !define JRE_VERSION "1.5.0"
 !define Vendor "Apache Software Foundation"
 !define Project "Apache Directory"
@@ -42,19 +61,19 @@
 XPStyle on
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${SourceDir}/main/resources/both_header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\header_server.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}/main/resources/welcome.bmp"
-!define iconfile "${SourceDir}/main/resources/adstree.ico"
-!define MUI_ICON ${iconfile}
-!define MUI_UNICON ${iconfile}
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome_server.bmp"
+!define iconfile "${SourceDir}\main\resources\server-installer.ico"
+!define MUI_ICON "${iconfile}"
+!define MUI_UNICON "${iconfile}"
 
 ;--------------------------------
 ;Pages
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "win32\LICENSE"
 
   ; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install JRE
   ; Otherwise you won't see it.
@@ -91,7 +110,7 @@
     Var JAVA_HOME_DIR
     !define MUI_DIRECTORYPAGE_VARIABLE          $JAVA_HOME_DIR  ;selected by user
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION  "Java JDK Home Directory"     ;descriptive text
-    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the Java JDK home directory that you would like to use for running the installed applications."
+    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the Java home directory that you would like to use for running the installed applications."
     !insertmacro MUI_PAGE_DIRECTORY  ; this pops-up the GUI page
 
 
@@ -195,9 +214,9 @@
 
     ;I am hand picking the files for now, but we could simplify this by creating a template for new instances
     SetOutPath "$INSTANCE_HOME_DIR\default\conf"
-    File "conf/log4j.properties"
-    File /oname=apacheds.conf "conf/apacheds-default.conf"
-    File "conf/server.xml"
+    File "conf\log4j.properties"
+    File /oname=apacheds.conf "conf\apacheds-default.conf"
+    File "conf\server.xml"
 
     Push "$INSTANCE_HOME_DIR\default\conf"
     Push "*.*"
@@ -355,10 +374,10 @@
   Push $3	; $3 and $4 are used for checking the major/minor version of java
   Push $4
   ;MessageBox MB_OK "Detecting JRE"
-  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ;MessageBox MB_OK "Read : $1"
   StrCmp $1 "" DetectTry2
-  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
   ;MessageBox MB_OK "Read 3: $2"
   StrCmp $2 "" DetectTry2
   Goto GetJRE

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-suite-win.nsi?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-suite-win.nsi (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-suite-win.nsi Wed Aug 29 13:55:22 2007
@@ -1,8 +1,27 @@
+#
+#  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.
+#
+
 !define AppName "${app.description}"
 !define AppVersion "${app.version}"
 !define OutFile "${app.final.name}"
 !define ShortName "${app}"
-!define SourceDir "${app.base.dir}/src"
+!define SourceDir "${app.base.dir}\src"
 !define JRE_VERSION "1.5.0"
 !define Vendor "Apache Software Foundation"
 !define Project "Apache Directory"
@@ -44,19 +63,19 @@
 XPStyle on
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${SourceDir}/main/resources/both_header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${SourceDir}\main\resources\header_suite.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}/main/resources/welcome.bmp"
-!define iconfile "${SourceDir}/main/resources/adstree.ico"
-!define MUI_ICON ${iconfile}
-!define MUI_UNICON ${iconfile}
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SourceDir}\main\resources\welcome_suite.bmp"
+!define iconfile "${SourceDir}\main\resources\suite-installer.ico"
+!define MUI_ICON "${iconfile}"
+!define MUI_UNICON "${iconfile}"
 
 ;--------------------------------
 ;Pages
 
   ; License page
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "win32/LICENSE"
+  !insertmacro MUI_PAGE_LICENSE "win32\LICENSE"
 
   ; This page checks for JRE. It displays a dialog based on JRE.ini if it needs to install JRE
   ; Otherwise you won't see it.
@@ -99,7 +118,7 @@
     Var JAVA_HOME_DIR
     !define MUI_DIRECTORYPAGE_VARIABLE          $JAVA_HOME_DIR  ;selected by user
     !define MUI_DIRECTORYPAGE_TEXT_DESTINATION  "Java JDK Home Directory"     ;descriptive text
-    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the Java JDK home directory that you would like to use for running the installed applications."
+    !define MUI_DIRECTORYPAGE_TEXT_TOP          "Select the Java home directory that you would like to use for running the installed applications."
     !insertmacro MUI_PAGE_DIRECTORY  ; this pops-up the GUI page
 
 
@@ -205,9 +224,9 @@
 
     ;I am hand picking the files for now, but we could simplify this by creating a template for new instances
     SetOutPath "$INSTANCE_HOME_DIR\default\conf"
-    File "conf/log4j.properties"
-    File /oname=apacheds.conf "conf/apacheds-default.conf"
-    File "conf/server.xml"
+    File "conf\log4j.properties"
+    File /oname=apacheds.conf "conf\apacheds-default.conf"
+    File "conf\server.xml"
 
     Push "$INSTANCE_HOME_DIR\default\conf"
     Push "*.*"
@@ -241,9 +260,16 @@
 SectionEnd
 Section "Example Connections" SecStudioConnections
   SectionIn 1 3
-  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core\connections.xml" End 0
+
+  #.metadata\.plugins\org.apache.directory.studio.connection.core
+  #.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core\browserconnections.xml" End 0
   SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.ldapbrowser.core"
-  File "..\..\..\src\main\resources\connections.xml"
+  File "${SourceDir}\main\resources\browserconnections.xml"
+
+  IfFileExists "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core\connections.xml" End 0
+  SetOutPath "$PROFILE\.ApacheDirectoryStudio\.metadata\.plugins\org.apache.directory.studio.connection.core"
+  File "${SourceDir}\main\resources\connections.xml"
 End:
 
 SectionEnd
@@ -395,10 +421,10 @@
   Push $3	; $3 and $4 are used for checking the major/minor version of java
   Push $4
   ;MessageBox MB_OK "Detecting JRE"
-  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
   ;MessageBox MB_OK "Read : $1"
   StrCmp $1 "" DetectTry2
-  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
   ;MessageBox MB_OK "Read 3: $2"
   StrCmp $2 "" DetectTry2
   Goto GetJRE

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-sysconfig.conf
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-sysconfig.conf?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-sysconfig.conf (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-sysconfig.conf Wed Aug 29 13:55:22 2007
@@ -1,2 +1,21 @@
+#
+#  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.
+#
+
 INSTANCE_HOME="/var/lib/apacheds"
 APACHEDS_HOME="/opt/@app@-@app.version@"

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds.conf
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds.conf?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds.conf (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds.conf Wed Aug 29 13:55:22 2007
@@ -1,3 +1,22 @@
+#
+#  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.
+#
+
 #include /etc/apacheds/%INSTANCE%.conf
 
 # If the default java executable is not on the path,
@@ -6,7 +25,6 @@
 #
 #wrapper.java.command=/usr/local/java/jdk1.5.0_10/bin/java
 #
-
 wrapper.java.command=@app.java.home@
 
 wrapper.java.mainclass=org.apache.directory.daemon.TanukiBootstrapper

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+#    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.
+#############################################################################
 log4j.rootCategory=WARN, R, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/rpm-apacheds-tools.sh
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/rpm-apacheds-tools.sh?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/rpm-apacheds-tools.sh (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/rpm-apacheds-tools.sh Wed Aug 29 13:55:22 2007
@@ -1,4 +1,23 @@
 #!/bin/sh
+#
+#  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.
+#
+
 # Really simple script to launch apacheds tools with RPM installer
 
 . /etc/sysconfig/apacheds

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/java/Dummy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/java/Dummy.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/java/Dummy.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/java/Dummy.java Wed Aug 29 13:55:22 2007
@@ -1 +1,20 @@
+/*
+ *  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. 
+ *  
+ */
 public class Dummy {}

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/connections.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/connections.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/connections.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/connections.xml Wed Aug 29 13:55:22 2007
@@ -1,96 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_02" class="java.beans.XMLDecoder"> 
- <array class="[Ljava.lang.Object;" length="1"> 
-  <void index="0"> 
-   <array class="java.lang.Object" length="3"> 
-    <void index="0"> 
-     <object class="org.apache.directory.studio.ldapbrowser.core.model.ConnectionParameter"> 
-      <void property="aliasesDereferencingMethod"> 
-       <int>1</int> 
-      </void> 
-      <void property="authMethod"> 
-       <int>1</int> 
-      </void> 
-      <void property="baseDN"> 
-       <object class="org.apache.directory.studio.ldapbrowser.core.model.DN"> 
-        <void property="rdns"> 
-         <array class="org.apache.directory.studio.ldapbrowser.core.model.RDN" length="2"> 
-          <void index="0"> 
-           <object class="org.apache.directory.studio.ldapbrowser.core.model.RDN"> 
-            <void property="parts"> 
-             <array class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart" length="1"> 
-              <void index="0"> 
-               <object class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart"> 
-                <void property="type"> 
-                 <string>dc</string> 
-                </void> 
-                <void property="unencodedValue"> 
-                 <string>example</string> 
-                </void> 
-               </object> 
-              </void> 
-             </array> 
-            </void> 
-           </object> 
-          </void> 
-          <void index="1"> 
-           <object class="org.apache.directory.studio.ldapbrowser.core.model.RDN"> 
-            <void property="parts"> 
-             <array class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart" length="1"> 
-              <void index="0"> 
-               <object class="org.apache.directory.studio.ldapbrowser.core.model.RDNPart"> 
-                <void property="type"> 
-                 <string>dc</string> 
-                </void> 
-                <void property="unencodedValue"> 
-                 <string>com</string> 
-                </void> 
-               </object> 
-              </void> 
-             </array> 
-            </void> 
-           </object> 
-          </void> 
-         </array> 
-        </void> 
-       </object> 
-      </void> 
-      <void property="bindPassword"> 
-       <string>secret</string> 
-      </void> 
-      <void property="bindPrincipal"> 
-       <string>uid=admin,ou=system</string> 
-      </void> 
-      <void property="connectionProviderClassName"> 
-       <string>org.apache.directory.studio.ldapbrowser.core.internal.model.JNDIConnectionProvider</string> 
-      </void> 
-      <void property="countLimit"> 
-       <int>1000</int> 
-      </void> 
-      <void property="fetchBaseDNs"> 
-       <boolean>true</boolean> 
-      </void> 
-      <void property="host"> 
-       <string>localhost</string> 
-      </void> 
-      <void property="name"> 
-       <string>Example</string> 
-      </void> 
-      <void property="port"> 
-       <int>10389</int> 
-      </void> 
-      <void property="referralsHandlingMethod"> 
-       <int>1</int> 
-      </void> 
-     </object> 
-    </void> 
-    <void index="1"> 
-     <array class="org.apache.directory.studio.ldapbrowser.core.model.SearchParameter" length="0"/> 
-    </void> 
-    <void index="2"> 
-     <array class="org.apache.directory.studio.ldapbrowser.core.model.BookmarkParameter" length="0"/> 
-    </void> 
-   </array> 
-  </void> 
- </array> 
-</java> 
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_02" class="java.beans.XMLDecoder">
+  <array class="java.lang.Object" length="1">
+    <void index="0">
+      <object class="org.apache.directory.studio.connection.core.ConnectionParameter">
+        <void property="authMethod">
+          <object class="org.apache.directory.studio.connection.core.ConnectionParameter$AuthenticationMethod" method="valueOf">
+            <string>SIMPLE</string>
+          </object>
+        </void>
+        <void property="bindPassword">
+          <string>secret</string>
+        </void>
+        <void property="bindPrincipal">
+          <string>uid=admin,ou=system</string>
+        </void>
+        <void property="encryptionMethod">
+          <object class="org.apache.directory.studio.connection.core.ConnectionParameter$EncryptionMethod" method="valueOf">
+            <string>NONE</string>
+          </object>
+        </void>
+        <void property="extendedProperties">
+          <void method="put">
+            <string>ldapbrowser.aliasesDereferencingMethod</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.timeLimit</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.fetchBaseDns</string>
+            <string>true</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.referralsHandlingMethod</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.countLimit</string>
+            <string>0</string>
+          </void>
+          <void method="put">
+            <string>ldapbrowser.baseDn</string>
+            <string></string>
+          </void>
+        </void>
+        <void property="host">
+          <string>localhost</string>
+        </void>
+        <void property="name">
+          <string>Example</string>
+        </void>
+        <void property="port">
+          <int>10389</int>
+        </void>
+      </object>
+    </void>
+  </array>
+</java>
+

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-main/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-main/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-main/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-main/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+#    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.
+#############################################################################
 log4j.rootCategory=WARN, stdout, R
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-sar/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-sar/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-sar/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-sar/pom.xml Wed Aug 29 13:55:22 2007
@@ -1,4 +1,21 @@
 <?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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/exportcmd/10_entries.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/exportcmd/10_entries.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/exportcmd/10_entries.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/exportcmd/10_entries.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: o=neworganization, dc=example,dc=com
 objectclass: organization
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample1.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample1.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample1.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample1.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=Product Development, dc=example, dc=com
 ou: Product Development
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample2.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample2.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample2.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample2.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=Product Development, dc=example, dc=com
 ou: Product Development
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=Product Testing, dc=example, dc=com
 ou: Product Development
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3VariousSpacing.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3VariousSpacing.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3VariousSpacing.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3VariousSpacing.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=Product Testing, dc=example, dc=com
 ou: Product Development
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_10_entries.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_10_entries.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_10_entries.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_10_entries.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: o=neworganization, dc=example,dc=com
 objectclass: organization
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: o=neworganization, dc=example,dc=com
 objectclass: organization
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry_on_error.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry_on_error.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry_on_error.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry_on_error.ldif Wed Aug 29 13:55:22 2007
@@ -1 +1,24 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_2_entries_error_and_ok.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_2_entries_error_and_ok.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_2_entries_error_and_ok.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_2_entries_error_and_ok.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: o=neworganization, dc=example,dc=com
 objectclass: organization
 objectclass: top

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+#    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.
+#############################################################################
 log4j.rootCategory=OFF, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/DIRSERVER951ITest.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/DIRSERVER951ITest.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/DIRSERVER951ITest.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/DIRSERVER951ITest.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=test,ou=system
 objectClass: top
 objectClass: organizationalUnit

Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/NegationOperatorITest.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/NegationOperatorITest.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/NegationOperatorITest.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/NegationOperatorITest.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+#  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.
+#
+#   EXAMPLE.COM is reserved for testing according to this RFC:
+#
+#   http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
 dn: ou=actors,ou=system
 objectClass: top
 objectClass: organizationalUnit

Modified: directory/sandbox/akarasulu/refactoring-daemon-trunk/bootstrappers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-daemon-trunk/bootstrappers/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-daemon-trunk/bootstrappers/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-daemon-trunk/bootstrappers/pom.xml Wed Aug 29 13:55:22 2007
@@ -55,26 +55,6 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>install-library</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>install-file</goal>
-            </goals>
-            <configuration>
-              <groupId>org.tanukisoftware</groupId>
-              <artifactId>wrapper</artifactId>
-              <version>3.2.3</version>
-              <packaging>jar</packaging>
-              <file>../plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/lib/wrapper.jar</file>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

Modified: directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original)
+++ directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Wed Aug 29 13:55:22 2007
@@ -21,12 +21,9 @@
 
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Properties;
 
-import org.apache.directory.daemon.Bootstrapper;
 import org.apache.directory.daemon.InstallationLayout;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -185,9 +182,7 @@
         // copy over the REQUIRED daemon.jar file 
         try
         {
-            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/wrapper.jar" ),
-                    new File( layout.getLibDirectory(), "wrapper.jar" ) );
-
+            FileUtils.copyFile( mymojo.getDaemon().getFile(), new File( layout.getLibDirectory(), "wrapper.jar" ) );
         }
         catch ( IOException e )
         {
@@ -251,8 +246,6 @@
                         new File( layout.getBinDirectory(), target.getApplication().getName() ) );
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-32.so" ),
                         new File( layout.getLibDirectory(), "libwrapper.so" ) );
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/wrapper.jar" ),
-                        new File( layout.getLibDirectory(), "wrapper.jar" ) );
             }
             catch ( IOException e )
             {
@@ -261,18 +254,18 @@
         }
 
 
-        // now copy over the jsvc executable renaming it to the applicationName 
-        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64" ) )
+        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64" ) && target.getDaemonFramework().equals("tanuki"))
         {
-            File executable = new File( layout.getBinDirectory(), target.getApplication().getName() );
             try
             {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_linux_x86_64" ), executable );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/bin/wrapper-linux-x86-64" ),
+                        new File( layout.getBinDirectory(), target.getApplication().getName() ) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-64.so" ),
+                        new File( layout.getLibDirectory(), "libwrapper.so" ) );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "
-                    + getClass().getResource( "jsvc_linux_x86_64" ) + " into position " + executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib and bin directories");
             }
         }
 

Modified: directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java (original)
+++ directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java Wed Aug 29 13:55:22 2007
@@ -64,8 +64,8 @@
     static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
     static final String LOGGER_ARTIFACT_ID = "slf4j-api";
     static final String LOGGER_GROUP_ID = "org.slf4j";
-    static final String DAEMON_ARTIFACT_ID = "commons-daemon";
-    static final String DAEMON_GROUP_ID = "commons-daemon";
+    static final String DAEMON_ARTIFACT_ID = "wrapper";
+    static final String DAEMON_GROUP_ID = "tanukisoft";
 
     /**
      * The target directory into which the mojo creates os and platform 



Mime
View raw message