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/14 01:48:54 UTC
svn commit: r486912 - in /directory/branches/trunks/schema2/apacheds: core/
core/src/main/java/org/apache/directory/server/core/schema/bootstrap/
core/src/main/schema/ schema-bootstrap/
schema-bootstrap/src/main/java/org/apache/directory/server/core/sc...
Author: akarasulu
Date: Wed Dec 13 16:48:53 2006
New Revision: 486912
URL: http://svn.apache.org/viewvc?view=rev&rev=486912
Log:
moved all bootstrap schema elements out of core into an independent schema-bootstrap module
Added:
directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/
- copied from r486909, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/
directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/schema/
- copied from r486909, directory/branches/trunks/schema2/apacheds/core/src/main/schema/
Removed:
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/
directory/branches/trunks/schema2/apacheds/core/src/main/schema/
Modified:
directory/branches/trunks/schema2/apacheds/core/pom.xml
directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml
directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
Modified: directory/branches/trunks/schema2/apacheds/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core/pom.xml?view=diff&rev=486912&r1=486911&r2=486912
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/core/pom.xml Wed Dec 13 16:48:53 2006
@@ -62,45 +62,6 @@
</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>
Modified: directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml?view=diff&rev=486912&r1=486911&r2=486912
==============================================================================
--- directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/schema-bootstrap/pom.xml Wed Dec 13 16:48:53 2006
@@ -19,6 +19,61 @@
<artifactId>apacheds-schema-registries</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-shared</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ </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>
+ </build>
</project>
Modified: directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java?view=diff&rev=486912&r1=486909&r2=486912
==============================================================================
--- directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java (original)
+++ directory/branches/trunks/schema2/apacheds/schema-bootstrap/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java Wed Dec 13 16:48:53 2006
@@ -28,7 +28,6 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.jndi.ServerDirStateFactory;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
import org.apache.directory.server.core.schema.ComparatorRegistry;
import org.apache.directory.server.core.schema.DITContentRuleRegistry;