directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r571138 - in /directory/studio/trunk: dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ dependencies/externals/org/apache/d...
Date Thu, 30 Aug 2007 12:39:35 GMT
Author: pamarcelot
Date: Thu Aug 30 05:39:34 2007
New Revision: 571138

URL: http://svn.apache.org/viewvc?rev=571138&view=rev
Log:
DIRSTUDIO-177 (Update dependencies on Apache DS jars). Updated Schema Editor classes and XML
schema files to match the new depencies requirements.

Added:
    directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/
    directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/apacheds-core-plugin-1.5.1-SNAPSHOT.jar
  (with props)
    directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml
  (with props)
Modified:
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/shared-asn1-0.9.7-SNAPSHOT.jar
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/shared-converter-0.9.7-SNAPSHOT.jar
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/shared-ldap-0.9.7-SNAPSHOT.jar
    directory/studio/trunk/studio-schemaeditor/.classpath
    directory/studio/trunk/studio-schemaeditor/META-INF/MANIFEST.MF
    directory/studio/trunk/studio-schemaeditor/ivy.xml
    directory/studio/trunk/studio-schemaeditor/resources/schemas/apachemeta.xml
    directory/studio/trunk/studio-schemaeditor/resources/schemas/nis.xml
    directory/studio/trunk/studio-schemaeditor/resources/schemas/system.xml
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDSSchemaImporter.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java

Added: directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/apacheds-core-plugin-1.5.1-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/apacheds-core-plugin-1.5.1-SNAPSHOT.jar?rev=571138&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/apacheds-core-plugin-1.5.1-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml?rev=571138&view=auto
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml
(added)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml
Thu Aug 30 05:39:34 2007
@@ -0,0 +1,14 @@
+<ivy-module version="1.0">
+	<info organisation="org.apache.directory.server"
+		module="apacheds-core-plugin"
+		revision="1.5.1-SNAPSHOT"
+		status="release"
+		publication="20070830140800"
+	/>
+	<configurations>
+		<conf name="default" visibility="public"/>
+	</configurations>
+	<publications>
+		<artifact name="apacheds-core-plugin" type="jar" ext="jar" conf="default"/>
+	</publications>
+</ivy-module>

Propchange: directory/studio/trunk/dependencies/externals/org/apache/directory/server/apacheds-core-plugin/1.5.1-SNAPSHOT/ivy.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ivy.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/ivy.xml
Thu Aug 30 05:39:34 2007
@@ -3,7 +3,7 @@
 		module="shared-asn1"
 		revision="0.9.7-SNAPSHOT"
 		status="release"
-		publication="20070426221800"
+		publication="20070830140800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/shared-asn1-0.9.7-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.7-SNAPSHOT/shared-asn1-0.9.7-SNAPSHOT.jar?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/ivy.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/ivy.xml
Thu Aug 30 05:39:34 2007
@@ -3,7 +3,7 @@
 		module="shared-converter"
 		revision="0.9.7-SNAPSHOT"
 		status="release"
-		publication="20070426221800"
+		publication="20070830140800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/shared-converter-0.9.7-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-converter/0.9.7-SNAPSHOT/shared-converter-0.9.7-SNAPSHOT.jar?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/ivy.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/ivy.xml
Thu Aug 30 05:39:34 2007
@@ -3,7 +3,7 @@
 		module="shared-ldap"
 		revision="0.9.7-SNAPSHOT"
 		status="release"
-		publication="20070426221800"
+		publication="20070830140800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/shared-ldap-0.9.7-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.7-SNAPSHOT/shared-ldap-0.9.7-SNAPSHOT.jar?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/studio-schemaeditor/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/.classpath?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/.classpath (original)
+++ directory/studio/trunk/studio-schemaeditor/.classpath Thu Aug 30 05:39:34 2007
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.2.jar"/>
-	<classpathentry kind="lib" path="lib/apacheds-core-plugin-1.5.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/apacheds-core-plugin-1.5.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/shared-converter-0.9.7-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: directory/studio/trunk/studio-schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/META-INF/MANIFEST.MF?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-schemaeditor/META-INF/MANIFEST.MF Thu Aug 30 05:39:34 2007
@@ -16,5 +16,5 @@
  org.apache.directory.studio.jars
 Eclipse-LazyStart: true
 Bundle-ClassPath: .,
- lib/apacheds-core-plugin-1.5.0-SNAPSHOT.jar,
+ lib/apacheds-core-plugin-1.5.1-SNAPSHOT.jar,
  lib/shared-converter-0.9.7-SNAPSHOT.jar

Modified: directory/studio/trunk/studio-schemaeditor/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/ivy.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/ivy.xml (original)
+++ directory/studio/trunk/studio-schemaeditor/ivy.xml Thu Aug 30 05:39:34 2007
@@ -24,7 +24,7 @@
 					rev="3.8.2"/>
 		<dependency org="org.apache.directory.server" 
 					name="apacheds-core-plugin" 
-					rev="1.5.0-SNAPSHOT"/>
+					rev="1.5.1-SNAPSHOT"/>
 		<dependency org="org.apache.directory.shared" 
 					name="shared-converter" 
 					rev="0.9.7-SNAPSHOT"/>

Modified: directory/studio/trunk/studio-schemaeditor/resources/schemas/apachemeta.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/resources/schemas/apachemeta.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/resources/schemas/apachemeta.xml (original)
+++ directory/studio/trunk/studio-schemaeditor/resources/schemas/apachemeta.xml Thu Aug 30
05:39:34 2007
@@ -564,31 +564,31 @@
       </matchingrule>
    </matchingrules>
    <syntaxes>
-      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.2" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.2" obsolete="false" humanreadable="true">
          <aliases>
             <alias>numericOid</alias>
          </aliases>
          <description>The syntax for numericoids.</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.6" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.6" obsolete="false" humanreadable="true">
          <aliases>
             <alias>objectName</alias>
          </aliases>
          <description>The syntax for object names.</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.0" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.0" obsolete="false" humanreadable="true">
          <aliases>
             <alias>nameOrOid</alias>
          </aliases>
          <description>The syntax for either numeric ids or names.</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.4" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.4" obsolete="false" humanreadable="true">
          <aliases>
             <alias>numeric</alias>
          </aliases>
          <description>The syntax for numeric strings.</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.1" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.1" obsolete="false" humanreadable="true">
          <aliases>
             <alias>objectClassType</alias>
          </aliases>

Modified: directory/studio/trunk/studio-schemaeditor/resources/schemas/nis.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/resources/schemas/nis.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/resources/schemas/nis.xml (original)
+++ directory/studio/trunk/studio-schemaeditor/resources/schemas/nis.xml Thu Aug 30 05:39:34
2007
@@ -503,13 +503,13 @@
       </matchingrule>
    </matchingrules>
    <syntaxes>
-      <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
          <aliases>
             <alias>NIS Netgroup Triple</alias>
          </aliases>
          <description>RFC2307 NIS Netgroup Triple</description>
       </syntax>
-      <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadible="true">
+      <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
          <aliases>
             <alias>NIS Boot Parameter</alias>
          </aliases>

Modified: directory/studio/trunk/studio-schemaeditor/resources/schemas/system.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/resources/schemas/system.xml?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/resources/schemas/system.xml (original)
+++ directory/studio/trunk/studio-schemaeditor/resources/schemas/system.xml Thu Aug 30 05:39:34
2007
@@ -731,355 +731,355 @@
 	</matchingrules>
 	<syntaxes>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.48" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Supplier And Consumer</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.55" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Modify Rights</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Country String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Supported Algorithm</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>OID</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Data Quality Syntax</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.57" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>LDAP BootstrapSchema Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.35" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Name Form Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Enhanced Guide</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Telex Number</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.1" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>ACI Item</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Presentation Address</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.59" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Trigger Specification</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Facsimile Telephone Number</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Attribute Type Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Object Class Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Printable String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Directory String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.56" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>LDAP BootstrapSchema Definition</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DN</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Subtree Specification</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Fax</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.2" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Access Point</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Name And Optional UID</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Certificate</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.53" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>UTC Time</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Protocol Information</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.47" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Supplier Or Consumer</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DSA Quality Syntax</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.32" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Mail Preference</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Postal Address</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.33" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>MHS OR Address</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>IA5 String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Octet String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Bit String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.16" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DIT Content Rule Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Other Mailbox</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.17" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DIT Structure Rule Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Boolean</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>INTEGER</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Generalized Time</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.46" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Supplier Information</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Audio</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.58" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Substring Assertion</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Certificate List</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Matching Rule Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Numeric String</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Delivery Method</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Teletex Terminal Identifier</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.18" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DL Submit Permission</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>JPEG</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Telephone Number</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.29" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Master And Shadow Access Points</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.20" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>DSE Type</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Binary</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false"
-			humanreadible="false">
+			humanreadable="false">
 			<aliases>
 				<alias>Certificate Pair</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Matching Rule Use Description</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>Guide</alias>
 			</aliases>
 		</syntax>
 		<syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false"
-			humanreadible="true">
+			humanreadable="true">
 			<aliases>
 				<alias>LDAP Syntax Description</alias>
 			</aliases>

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java
Thu Aug 30 05:39:34 2007
@@ -31,7 +31,7 @@
 
 /**
  * This class implements an object class.
- *
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
@@ -57,9 +57,9 @@
 
     /**
      * Creates a new instance of ObjectClassImpl.
-     *
+     * 
      * @param oid
-     *      the OID of the object class
+     *            the OID of the object class
      */
     public ObjectClassImpl( String oid )
     {
@@ -68,7 +68,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.AbstractSchemaObject#setNames(java.lang.String[])
      */
     public void setNames( String[] names )
@@ -77,7 +79,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.AbstractSchemaObject#getOid()
      */
     public String getOid()
@@ -88,9 +92,9 @@
 
     /**
      * Set the OID.
-     *
+     * 
      * @param oid
-     *      the OID value
+     *            the OID value
      */
     public void setOid( String oid )
     {
@@ -98,7 +102,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.AbstractSchemaObject#setDescription(java.lang.String)
      */
     public void setDescription( String description )
@@ -107,7 +113,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.AbstractSchemaObject#setObsolete(boolean)
      */
     public void setObsolete( boolean obsolete )
@@ -116,7 +124,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.ObjectClass#getType()
      */
     public ObjectClassTypeEnum getType()
@@ -127,9 +137,9 @@
 
     /**
      * Sets the type of the object class.
-     *
+     * 
      * @param objectClassTypeEnum
-     *      the type of the object class
+     *            the type of the object class
      */
     public void setType( ObjectClassTypeEnum objectClassTypeEnum )
     {
@@ -137,11 +147,39 @@
     }
 
 
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.ObjectClass#isAbstract()
+     */
+    public boolean isAbstract()
+    {
+        return ObjectClassTypeEnum.ABSTRACT.equals( getType() );
+    }
+
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.directory.shared.ldap.schema.ObjectClass#isAuxiliary()
+     */
+    public boolean isAuxiliary()
+    {
+        return ObjectClassTypeEnum.AUXILIARY.equals( getType() );
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.schema.ObjectClass#isStructural()
+     */
+    public boolean isStructural()
+    {
+        return ObjectClassTypeEnum.STRUCTURAL.equals( getType() );
+    }
+
+
     /**
      * gets the names of the super classes.
-     *
-     * @return
-     *      the names of the super classes
+     * 
+     * @return the names of the super classes
      */
     public String[] getSuperClassesNames()
     {
@@ -151,9 +189,9 @@
 
     /**
      * Sets the names of the super classes.
-     *
+     * 
      * @param superClassesNames
-     *      the names of the super classes
+     *            the names of the super classes
      */
     public void setSuperClassesNames( String[] superClassesNames )
     {
@@ -161,7 +199,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.ObjectClass#getSuperClasses()
      */
     public ObjectClass[] getSuperClasses() throws NamingException
@@ -172,9 +212,8 @@
 
     /**
      * Gets the names of the mandatory attribute types.
-     *
-     * @return
-     *      the names of the mandatory attribute types
+     * 
+     * @return the names of the mandatory attribute types
      */
     public String[] getMustNamesList()
     {
@@ -184,9 +223,9 @@
 
     /**
      * Set the names of the mandatory attribute types.
-     *
+     * 
      * @param mustNamesList
-     *      the names of the mandatory attribute types
+     *            the names of the mandatory attribute types
      */
     public void setMustNamesList( String[] mustNamesList )
     {
@@ -194,7 +233,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.ObjectClass#getMustList()
      */
     public AttributeType[] getMustList() throws NamingException
@@ -205,9 +246,8 @@
 
     /**
      * Gets the names of the optional attribute types.
-     *
-     * @return
-     *      the names of the optional attribute types
+     * 
+     * @return the names of the optional attribute types
      */
     public String[] getMayNamesList()
     {
@@ -217,9 +257,9 @@
 
     /**
      * Sets the names of the optional attribute types.
-     *
+     * 
      * @param mayNamesList
-     *      the names of the optional attribute types
+     *            the names of the optional attribute types
      */
     public void setMayNamesList( String[] mayNamesList )
     {
@@ -227,7 +267,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.ObjectClass#getMayList()
      */
     public AttributeType[] getMayList() throws NamingException
@@ -236,7 +278,9 @@
     }
 
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.directory.shared.ldap.schema.AbstractSchemaObject#equals(java.lang.Object)
      */
     public boolean equals( Object obj )

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java
Thu Aug 30 05:39:34 2007
@@ -50,11 +50,11 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.shared.ldap.schema.AbstractSyntax#setHumanReadible(boolean)
+     * @see org.apache.directory.shared.ldap.schema.AbstractSyntax#setHumanReadable(boolean)
      */
-    public void setHumanReadible( boolean isHumanReadible )
+    public void setHumanReadable( boolean isHumanReadable )
     {
-        super.setHumanReadible( isHumanReadible );
+        super.setHumanReadable( isHumanReadable );
     }
 
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDSSchemaImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDSSchemaImporter.java?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDSSchemaImporter.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDSSchemaImporter.java
Thu Aug 30 05:39:34 2007
@@ -303,7 +303,7 @@
         syntax.setNames( getNames( sr ) );
         syntax.setDescription( getDescription( sr ) );
         syntax.setObsolete( isObsolete( sr ) );
-        syntax.setHumanReadible( isHumanReadable( sr ) );
+        syntax.setHumanReadable( isHumanReadable( sr ) );
         return syntax;
     }
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
Thu Aug 30 05:39:34 2007
@@ -62,7 +62,7 @@
     private static final String COLLECTIVE_TAG = "collective";
     private static final String DESCRIPTION_TAG = "description";
     private static final String EQUALITY_TAG = "equality";
-    private static final String HUMAN_READIBLE_TAG = "humanreadible";
+    private static final String HUMAN_READABLE_TAG = "humanreadable";
     private static final String MANDATORY_TAG = "mandatory";
     private static final String MATCHING_RULE_TAG = "matchingrule";
     private static final String MATCHING_RULES_TAG = "matchingrules";
@@ -544,13 +544,13 @@
         }
 
         // Human Readible
-        if ( syntax.isHumanReadible() )
+        if ( syntax.isHumanReadable() )
         {
-            syntaxNode.addAttribute( HUMAN_READIBLE_TAG, BOOLEAN_TRUE );
+            syntaxNode.addAttribute( HUMAN_READABLE_TAG, BOOLEAN_TRUE );
         }
         else
         {
-            syntaxNode.addAttribute( HUMAN_READIBLE_TAG, BOOLEAN_FALSE );
+            syntaxNode.addAttribute( HUMAN_READABLE_TAG, BOOLEAN_FALSE );
         }
     }
 

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=571138&r1=571137&r2=571138&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
Thu Aug 30 05:39:34 2007
@@ -58,7 +58,7 @@
     private static final String COLLECTIVE_TAG = "collective";
     private static final String DESCRIPTION_TAG = "description";
     private static final String EQUALITY_TAG = "equality";
-    private static final String HUMAN_READIBLE_TAG = "humanreadible";
+    private static final String HUMAN_READABLE_TAG = "humanreadable";
     private static final String MANDATORY_TAG = "mandatory";
     private static final String MATCHING_RULE_TAG = "matchingrule";
     private static final String MATCHING_RULES_TAG = "matchingrules";
@@ -754,10 +754,10 @@
         }
 
         // Human Readible
-        Attribute humanReadibleAttribute = element.attribute( HUMAN_READIBLE_TAG );
+        Attribute humanReadibleAttribute = element.attribute( HUMAN_READABLE_TAG );
         if ( ( humanReadibleAttribute != null ) && ( !humanReadibleAttribute.getValue().equals(
"" ) ) )
         {
-            syntax.setHumanReadible( readBoolean( humanReadibleAttribute.getValue() ) );
+            syntax.setHumanReadable( readBoolean( humanReadibleAttribute.getValue() ) );
         }
 
         // Adding the syntax to the schema



Mime
View raw message