You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/12/11 20:12:38 UTC
svn commit: r485830 - in /directory/branches/trunks/schema/apacheds: bootstrap-schema/ bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ bootstrap-schema/src/main/schema/ core/ core/src/main/java/org/apache/directory/ser...

Author: akarasulu
Date: Mon Dec 11 11:12:36 2006
New Revision: 485830

URL: http://svn.apache.org/viewvc?view=rev&rev=485830
Log:
moving a few things back where they belong in core

Added:
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
      - copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
      - copied unchanged from r485789, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/apachemeta.schema
Removed:
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheComparatorProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApacheNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaComparatorProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ApachemetaSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdComparator.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdMatch.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/NameOrNumericIdNormalizer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemComparatorProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemMatchingRuleProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemNormalizerProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxCheckerProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/SystemSyntaxProducer.java
    directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/apachemeta.schema
Modified:
    directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml
    directory/branches/trunks/schema/apacheds/core/pom.xml

Modified: directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml?view=diff&rev=485830&r1=485829&r2=485830
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml Mon Dec 11 11:12:36 2006
@@ -35,18 +35,6 @@
           <schemaSourcesDir>src/main/schema</schemaSourcesDir>
           <schemas>
             <schema>
-              <name>apache</name>
-              <dependencies>
-                <dependency>system</dependency>
-              </dependencies>
-            </schema>
-            <schema>
-              <name>apachemeta</name>
-              <dependencies>
-                <dependency>system</dependency>
-              </dependencies>
-            </schema>
-            <schema>
               <name>apachedns</name>
               <dependencies>
                 <dependency>system</dependency>
@@ -76,12 +64,6 @@
               </dependencies>
             </schema>
             <schema>
-              <name>core</name>
-              <dependencies>
-                <dependency>system</dependency>
-              </dependencies>
-            </schema>
-            <schema>
               <name>cosine</name>
               <dependencies>
                 <dependency>system</dependency>
@@ -117,9 +99,6 @@
                 <dependency>core</dependency>
                 <dependency>cosine</dependency>
               </dependencies>
-            </schema>
-            <schema>
-              <name>system</name>
             </schema>
             <schema>
               <name>mozilla</name>

Modified: directory/branches/trunks/schema/apacheds/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/pom.xml?view=diff&rev=485830&r1=485829&r2=485830
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/pom.xml (original)
+++ directory/branches/trunks/schema/apacheds/core/pom.xml Mon Dec 11 11:12:36 2006
@@ -36,6 +36,45 @@
     </dependency>
   </dependencies>
   <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-plugin</artifactId>
+        <configuration>
+          <schemaSourcesDir>src/main/schema</schemaSourcesDir>
+          <schemas>
+            <schema>
+              <name>apache</name>
+              <dependencies>
+                <dependency>system</dependency>
+              </dependencies>
+            </schema>
+            <schema>
+              <name>apachemeta</name>
+              <dependencies>
+                <dependency>system</dependency>
+              </dependencies>
+            </schema>
+             <schema>
+              <name>core</name>
+              <dependencies>
+                <dependency>system</dependency>
+              </dependencies>
+            </schema>
+            <schema>
+              <name>system</name>
+            </schema>
+           </schemas>
+        </configuration>
+         <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
     <resources>
       <resource>
         <directory>src/main/resources</directory>