Moved some classes into common package.

client/src/java/org/safehaus/penrose/connection/ConnectionClient.java

@@ -4,7 +4,6 @@
 import org.slf4j.LoggerFactory;
 import org.safehaus.penrose.client.BaseClient;
 import org.safehaus.penrose.client.PenroseClient;
-import org.safehaus.penrose.connection.ConnectionServiceMBean;
 
 /**
  * @author Endi Sukma Dewata

client/src/java/org/safehaus/penrose/connection/ConnectionManagerClient.java

@@ -8,6 +8,7 @@
 import org.safehaus.penrose.partition.PartitionManagerClient;
 import org.safehaus.penrose.client.PenroseClient;
 import org.safehaus.penrose.client.BaseClient;
+import org.safehaus.penrose.ldap.DN;
 import org.apache.log4j.Level;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.PatternLayout;
@@ -70,6 +71,14 @@ public void validateConnection(ConnectionConfig connectionConfig) throws Excepti
         );
     }
 
+    public Collection<DN> getNamingContexts(ConnectionConfig connectionConfig) throws Exception {
+        return (Collection<DN>)invoke(
+                "getNamingContexts",
+                new Object[] { connectionConfig },
+                new String[] { ConnectionConfig.class.getName() }
+        );
+    }
+
     public void createConnection(ConnectionConfig connectionConfig) throws Exception {
         invoke(
                 "createConnection",

client/src/java/org/safehaus/penrose/ldap/connection/LDAPConnectionClient.java

@@ -0,0 +1,47 @@
+package org.safehaus.penrose.ldap.connection;
+
+import org.safehaus.penrose.client.PenroseClient;
+import org.safehaus.penrose.connection.ConnectionClient;
+import org.safehaus.penrose.ldap.SearchResult;
+import org.safehaus.penrose.ldap.DN;
+import org.safehaus.penrose.ldap.SearchResponse;
+import org.safehaus.penrose.ldap.SearchRequest;
+import org.safehaus.penrose.schema.Schema;
+
+/**
+ * @author Endi Sukma Dewata
+ */
+public class LDAPConnectionClient extends ConnectionClient implements LDAPConnectionServiceMBean {
+
+    public LDAPConnectionClient(PenroseClient client, String partitionName, String connectionName) throws Exception {
+        super(client, partitionName, connectionName);
+    }
+
+    public SearchResult find(String dn) throws Exception {
+        return (SearchResult)invoke(
+                "find",
+                new Object[] { dn },
+                new String[] { String.class.getName() }
+        );
+    }
+
+    public SearchResult find(DN dn) throws Exception {
+        return (SearchResult)invoke(
+                "find", 
+                new Object[] { dn },
+                new String[] { DN.class.getName() }
+        );
+    }
+
+    public SearchResponse search(SearchRequest request, SearchResponse response) throws Exception {
+        return (SearchResponse)invoke(
+                "search",
+                new Object[] { request, response },
+                new String[] { SearchRequest.class.getName(), SearchResponse.class.getName() }
+        );
+    }
+
+    public Schema getSchema() throws Exception {
+        return (Schema)getAttribute("Schema");
+    }
+}

client/src/java/org/safehaus/penrose/schema/SchemaManagerClient.java

@@ -6,6 +6,7 @@
 import org.safehaus.penrose.schema.Schema;
 import org.safehaus.penrose.schema.ObjectClass;
 import org.safehaus.penrose.schema.AttributeType;
+import org.safehaus.penrose.schema.attributeSyntax.AttributeSyntax;
 
 import java.util.Collection;
 
@@ -121,4 +122,12 @@ public Collection<String> getAllObjectClassNames(String ocName) throws Exception
     public Schema getMergedSchema() throws Exception {
         return (Schema)getAttribute("MergedSchema");
     }
+
+    public AttributeSyntax getAttributeSyntax(String oid) throws Exception {
+        return (AttributeSyntax) invoke(
+                "getAttributeSyntax",
+                new Object[] { oid },
+                new String[] { String.class.getName() }
+        );
+    }
 }

common/build.xml

@@ -75,10 +75,16 @@
     <target name="javacc" depends="init">
         <attrib file="src/java/org/safehaus/penrose/filter/*.java" readonly="false"/>
         <javacc
-            target="../common/src/java/org/safehaus/penrose/filter/FilterParser.jj"
+            target="src/java/org/safehaus/penrose/filter/FilterParser.jj"
             javacchome="../lib/javacc"
             outputdirectory="src/java/org/safehaus/penrose/filter"
         />
+        <attrib file="src/java/org/safehaus/penrose/schema/*.java" readonly="false"/>
+        <javacc
+            target="src/java/org/safehaus/penrose/schema/LDAPv3Schema.jj"
+            javacchome="../lib/javacc"
+            outputdirectory="src/java/org/safehaus/penrose/schema"
+        />
     </target>
 
     <target name="compile" depends="init">

common/src/java/org/safehaus/penrose/connection/ConnectionManagerServiceMBean.java

@@ -1,5 +1,7 @@
 package org.safehaus.penrose.connection;
 
+import org.safehaus.penrose.ldap.DN;
+
 import java.util.Collection;
 import java.util.Map;
 
@@ -9,7 +11,10 @@
 public interface ConnectionManagerServiceMBean {
 
     public Collection<String> getConnectionNames() throws Exception;
+
     public void validateConnection(ConnectionConfig connectionConfig) throws Exception;
+    public Collection<DN> getNamingContexts(ConnectionConfig connectionConfig) throws Exception;
+
     public void createConnection(ConnectionConfig connectionConfig) throws Exception;
     public void renameConnection(String name, String newName) throws Exception;
     public void updateConnection(ConnectionConfig connectionConfig) throws Exception;

common/src/java/org/safehaus/penrose/connection/ConnectionServiceMBean.java

@@ -1,7 +1,5 @@
 package org.safehaus.penrose.connection;
 
-import org.safehaus.penrose.connection.ConnectionConfig;
-
 /**
  * @author Endi Sukma Dewata
  */

core/src/java/org/safehaus/penrose/federation/module/IdentityLinkingException.java → common/src/java/org/safehaus/penrose/federation/IdentityLinkingException.java

@@ -1,4 +1,4 @@
-package org.safehaus.penrose.federation.module;
+package org.safehaus.penrose.federation;
 
 import org.safehaus.penrose.ldap.Attributes;
 import org.safehaus.penrose.ldap.DN;

common/src/java/org/safehaus/penrose/filter/FilterParser.java

@@ -246,7 +246,7 @@ final public Filter Item() throws ParseException {
             filter = new SimpleFilter(attr, "=", FilterTool.unescape(value));
 
         } else {
-            Collection<Object> values = new ArrayList<Object>();
+            Collection values = new ArrayList();
             StringTokenizer st = new StringTokenizer(value, "*", true);
             while (st.hasMoreTokens()) {
                 String token = st.nextToken();

common/src/java/org/safehaus/penrose/filter/FilterParser.jj

@@ -244,7 +244,7 @@ Filter Item() :
             filter = new SimpleFilter(attr, "=", FilterTool.unescape(value));
 
         } else {
-            Collection<Object> values = new ArrayList<Object>();
+            Collection values = new ArrayList();
             StringTokenizer st = new StringTokenizer(value, "*", true);
             while (st.hasMoreTokens()) {
                 String token = st.nextToken();

common/src/java/org/safehaus/penrose/jdbc/JDBC.java

@@ -0,0 +1,35 @@
+package org.safehaus.penrose.jdbc;
+
+/**
+ * @author Endi Sukma Dewata
+ */
+public class JDBC {
+
+    public final static String DRIVER       = "driver";
+    public final static String URL          = "url";
+    public final static String USER         = "user";
+    public final static String PASSWORD     = "password";
+
+    public final static String BASE_DN      = "baseDn";
+    public final static String CATALOG      = "catalog";
+    public final static String SCHEMA       = "schema";
+    public final static String TABLE        = "table";
+    public final static String FILTER       = "filter";
+
+    public final static String SIZE_LIMIT   = "sizeLimit";
+    public final static String CREATE       = "create";
+
+    public final static String AUTHENTICATION          = "authentication";
+    public final static String AUTHENTICATION_DEFAULT  = "default";
+    public final static String AUTHENTICATION_FULL     = "full";
+    public final static String AUTHENTICATION_DISABLED = "disabled";
+
+    public final static String ADD          = "add";
+    public final static String BIND         = "bind";
+    public final static String COMPARE      = "compare";
+    public final static String DELETE       = "delete";
+    public final static String MODIFY       = "modify";
+    public final static String MODRDN       = "modrdn";
+    public final static String SEARCH       = "search";
+    public final static String UNBIND       = "unbind";
+}

common/src/java/org/safehaus/penrose/ldap/LDAP.java

@@ -34,6 +34,21 @@ public class LDAP {
 
     public static Logger log = LoggerFactory.getLogger(LDAP.class);
 
+    public final static String BASE_DN           = "baseDn";
+    public final static String NEW_BASE_DN       = "newBaseDn";
+    public final static String SCOPE             = "scope";
+    public final static String FILTER            = "filter";
+    public final static String OBJECT_CLASSES    = "objectClasses";
+
+    public final static String SIZE_LIMIT        = "sizeLimit";
+    public final static String TIME_LIMIT        = "timeLimit";
+    public final static String ATTRIBUTES        = "attributes";
+
+    public final static String AUTHENTICATION          = "authentication";
+    public final static String AUTHENTICATION_DEFAULT  = "default";
+    public final static String AUTHENTICATION_FULL     = "full";
+    public final static String AUTHENTICATION_DISABLED = "disabled";
+
     public final static DN ROOT_DSE_DN = new DN("");
     public final static DN SCHEMA_DN   = new DN("cn=Subschema");
 

common/src/java/org/safehaus/penrose/ldap/connection/LDAPConnectionServiceMBean.java

@@ -0,0 +1,20 @@
+package org.safehaus.penrose.ldap.connection;
+
+import org.safehaus.penrose.ldap.SearchResult;
+import org.safehaus.penrose.ldap.DN;
+import org.safehaus.penrose.ldap.SearchResponse;
+import org.safehaus.penrose.ldap.SearchRequest;
+import org.safehaus.penrose.schema.Schema;
+
+/**
+ * @author Endi Sukma Dewata
+ */
+public interface LDAPConnectionServiceMBean {
+
+    public SearchResult find(String dn) throws Exception;
+    public SearchResult find(DN dn) throws Exception;
+
+    public SearchResponse search(SearchRequest request, SearchResponse response) throws Exception;
+
+    public Schema getSchema() throws Exception;
+}

core/src/java/org/safehaus/penrose/mapping/Relationship.java → common/src/java/org/safehaus/penrose/mapping/Relationship.java

@@ -17,7 +17,6 @@
  */
 package org.safehaus.penrose.mapping;
 
-import java.io.ByteArrayInputStream;
 import java.util.*;
 
 import org.slf4j.LoggerFactory;

core/src/java/org/safehaus/penrose/schema/LDAPv3Schema.jj → common/src/java/org/safehaus/penrose/schema/LDAPv3Schema.jj

@@ -29,7 +29,6 @@ PARSER_BEGIN(SchemaParser)
 package org.safehaus.penrose.schema;
 
 import java.util.*;
-import org.safehaus.penrose.config.*;
 
 /**
  * LDAP Schema Parser.
@@ -93,14 +92,14 @@ import org.safehaus.penrose.config.*;
  */
 public class SchemaParser {
 
-  List schema = new ArrayList();
+  Schema schema = new Schema();
   List errors = new ArrayList();
 
   /**
    * Start parsing
    * @return the list of schema
    */
-  public List parse() throws ParseException {
+  public Schema parse() throws ParseException {
     try {
       Schema();
     } catch (ParseException ex) {
@@ -111,7 +110,7 @@ public class SchemaParser {
   /**
    * Get the list of schema from parsing
    */
-  public List getSchema() {
+  public Schema getSchema() {
     return this.schema;
   }
 
@@ -200,9 +199,9 @@ void Schema() :
 {
 	(
 		LOOKAHEAD( <ATTRIBUTETYPE> )
-		at = AttributeType() { schema.add(at); }
+		at = AttributeType() { schema.addAttributeType(at); }
 	|	LOOKAHEAD( <OBJECTCLASS> )
-		oc = ObjectClass() { schema.add(oc); }
+		oc = ObjectClass() { schema.addObjectClass(oc); }
 	)*
 }
 

core/src/java/org/safehaus/penrose/schema/ParseException.java → common/src/java/org/safehaus/penrose/schema/ParseException.java

@@ -162,7 +162,7 @@ public String getMessage() {
    * string literal.
    */
   protected String add_escapes(String str) {
-      StringBuilder retval = new StringBuilder();
+      StringBuffer retval = new StringBuffer();
       char ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))

common/src/java/org/safehaus/penrose/schema/Schema.java

@@ -36,6 +36,9 @@ public class Schema implements Serializable, Cloneable {
     protected Set<ObjectClass> objectClasses = new LinkedHashSet<ObjectClass>();
     protected Map<String,ObjectClass> objectClassesByNameOrOid = new TreeMap<String,ObjectClass>();
 
+    public Schema() {
+    }
+
     public Schema(String name) {
         this.name = name;
     }

common/src/java/org/safehaus/penrose/schema/SchemaManagerServiceMBean.java

@@ -3,6 +3,7 @@
 import org.safehaus.penrose.schema.Schema;
 import org.safehaus.penrose.schema.ObjectClass;
 import org.safehaus.penrose.schema.AttributeType;
+import org.safehaus.penrose.schema.attributeSyntax.AttributeSyntax;
 
 import java.util.Collection;
 
@@ -31,4 +32,6 @@ public interface SchemaManagerServiceMBean {
     public Collection<ObjectClass> getAllObjectClasses(String ocName) throws Exception;
     public Collection<String> getAllObjectClassNames(String ocName) throws Exception;
     public Schema getMergedSchema() throws Exception;
+
+    public AttributeSyntax getAttributeSyntax(String oid) throws Exception;
 }