directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1510268 - in /directory/escimo/trunk: common/ common/src/main/java/org/apache/directory/scim/ ldap/ ldap/src/main/java/org/apache/directory/scim/
Date Sun, 04 Aug 2013 17:33:21 GMT
Author: kayyagari
Date: Sun Aug  4 17:33:21 2013
New Revision: 1510268

URL: http://svn.apache.org/r1510268
Log:
o moved the attribute definitions to common
o added dependency on gson

Added:
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/AbstractAttribute.java
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ComplexAttribute.java
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/MultiValAttribute.java
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttribute.java
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java
    directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/User.java
Removed:
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/AbstractAttribute.java
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/ComplexAttribute.java
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/MultiValAttribute.java
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/SimpleAttribute.java
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java
    directory/escimo/trunk/ldap/src/main/java/org/apache/directory/scim/User.java
Modified:
    directory/escimo/trunk/common/pom.xml
    directory/escimo/trunk/ldap/pom.xml

Modified: directory/escimo/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/pom.xml?rev=1510268&r1=1510267&r2=1510268&view=diff
==============================================================================
--- directory/escimo/trunk/common/pom.xml (original)
+++ directory/escimo/trunk/common/pom.xml Sun Aug  4 17:33:21 2013
@@ -29,6 +29,11 @@
     <name>eSCIMo common API</name>
 
    <dependencies>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.2.4</version>
+    </dependency>
    </dependencies>
 
     <build>

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/AbstractAttribute.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/AbstractAttribute.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/AbstractAttribute.java
(added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/AbstractAttribute.java
Sun Aug  4 17:33:21 2013
@@ -0,0 +1,50 @@
+/*
+ *   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.
+ *
+ */
+package org.apache.directory.scim;
+
+
+/**
+ * TODO AbstractAttribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class AbstractAttribute
+{
+    private String name;
+
+
+    public AbstractAttribute( String name )
+    {
+        this.name = name;
+    }
+
+
+    public String getName()
+    {
+        return name;
+    }
+
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+
+}

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ComplexAttribute.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ComplexAttribute.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ComplexAttribute.java
(added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ComplexAttribute.java
Sun Aug  4 17:33:21 2013
@@ -0,0 +1,52 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.scim;
+
+
+import java.util.List;
+
+
+/**
+ * TODO SimpleAttribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ComplexAttribute extends AbstractAttribute
+{
+    private List<SimpleAttribute> atList;
+
+    public ComplexAttribute( String name, List<SimpleAttribute> atList )
+    {
+        super( name );
+        this.atList = atList;
+    }
+
+    public List<SimpleAttribute> getAtList()
+    {
+        return atList;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "ComplexAttribute [atList=" + atList + "]";
+    }
+
+}

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/MultiValAttribute.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/MultiValAttribute.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/MultiValAttribute.java
(added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/MultiValAttribute.java
Sun Aug  4 17:33:21 2013
@@ -0,0 +1,68 @@
+/*
+ *   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.
+ *
+ */
+package org.apache.directory.scim;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * TODO SimpleAttribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class MultiValAttribute extends AbstractAttribute
+{
+    private List<SimpleAttributeGroup> atGroupList;
+
+    public MultiValAttribute( String name, List<SimpleAttributeGroup> atGroupList )
+    {
+        super( name );
+        this.atGroupList = atGroupList;
+    }
+
+    public MultiValAttribute( String name )
+    {
+        super( name );
+    }
+
+    public List<SimpleAttributeGroup> getAtGroupList()
+    {
+        return atGroupList;
+    }
+
+    public void addAtGroup( SimpleAttributeGroup atGroup )
+    {
+        if( atGroupList == null )
+        {
+            atGroupList = new ArrayList<SimpleAttributeGroup>();
+        }
+        
+        atGroupList.add( atGroup );
+    }
+
+    @Override
+    public String toString()
+    {
+        return "MultiValAttribute [atGroupList=" + atGroupList + "]";
+    }
+    
+}

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttribute.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttribute.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttribute.java
(added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttribute.java
Sun Aug  4 17:33:21 2013
@@ -0,0 +1,64 @@
+/*
+ *   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.
+ *
+ */
+package org.apache.directory.scim;
+
+
+/**
+ * TODO SimpleAttribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class SimpleAttribute extends AbstractAttribute
+{
+    private Object value;
+
+
+    public SimpleAttribute( String name )
+    {
+        super( name );
+    }
+
+
+    public SimpleAttribute( String name, Object value )
+    {
+        super( name );
+        this.value = value;
+    }
+
+
+    public Object getValue()
+    {
+        return value;
+    }
+
+
+    public void setValue( Object value )
+    {
+        this.value = value;
+    }
+
+
+    @Override
+    public String toString()
+    {
+        return "SimpleAttribute [name=" + getName() + ", value=" + value + "]";
+    }
+
+}

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java
(added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/SimpleAttributeGroup.java
Sun Aug  4 17:33:21 2013
@@ -0,0 +1,71 @@
+/*
+ *   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.
+ *
+ */
+package org.apache.directory.scim;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * TODO SimpleAttribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class SimpleAttributeGroup
+{
+    private List<SimpleAttribute> atList;
+
+
+    public SimpleAttributeGroup()
+    {
+    }
+
+
+    public SimpleAttributeGroup( List<SimpleAttribute> atList )
+    {
+        this.atList = atList;
+    }
+
+
+    public void addAttribute( SimpleAttribute at )
+    {
+        if ( atList == null )
+        {
+            atList = new ArrayList<SimpleAttribute>();
+        }
+        
+        atList.add( at );
+    }
+
+
+    public List<SimpleAttribute> getAtList()
+    {
+        return atList;
+    }
+
+
+    @Override
+    public String toString()
+    {
+        return "SimpleAttributeGroup [atList=" + atList + "]";
+    }
+
+}

Added: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/User.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/User.java?rev=1510268&view=auto
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/User.java (added)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/User.java Sun Aug
 4 17:33:21 2013
@@ -0,0 +1,65 @@
+/*
+ *   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.
+ *
+ */
+package org.apache.directory.scim;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TODO User.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class User
+{
+    private List<SimpleAttribute> simpleList;
+    
+    private List<ComplexAttribute> complexList;
+    
+    private Map<String,List<AbstractAttribute>> uriAtMap = new HashMap<String,
List<AbstractAttribute>>();
+    
+    public void addAttribute( String uri, AbstractAttribute at )
+    {
+        List<AbstractAttribute> atList = uriAtMap.get( uri );
+        
+        if( atList == null )
+        {
+            atList = new ArrayList<AbstractAttribute>();
+            uriAtMap.put( uri, atList );
+        }
+        
+        atList.add( at );
+    }
+
+    public Map<String,List<AbstractAttribute>> getAttributes()
+    {
+        return uriAtMap;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return "User [simpleList=" + simpleList + ", complexList=" + complexList + ", uriAtMap="
+ uriAtMap + "]";
+    }
+    
+    
+}

Modified: directory/escimo/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/ldap/pom.xml?rev=1510268&r1=1510267&r2=1510268&view=diff
==============================================================================
--- directory/escimo/trunk/ldap/pom.xml (original)
+++ directory/escimo/trunk/ldap/pom.xml Sun Aug  4 17:33:21 2013
@@ -47,11 +47,5 @@
       <artifactId>dom4j</artifactId>
       <version>${dom4j.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-    </dependency>
   </dependencies>
 </project>



Mime
View raw message