You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/05/12 14:39:04 UTC

svn commit: r537401 - in /jackrabbit/trunk/jackrabbit-core: ./ applications/test/ src/main/java/META-INF/ src/main/java/org/apache/jackrabbit/core/ src/main/java/org/apache/jackrabbit/core/config/ src/main/java/org/apache/jackrabbit/core/fs/db/ src/mai...

Author: jukka
Date: Sat May 12 05:39:00 2007
New Revision: 537401

URL: http://svn.apache.org/viewvc?view=rev&rev=537401
Log:
JCR-903: Put resource files in java/{main,test}/resources

Added:
    jackrabbit/trunk/jackrabbit-core/src/main/resources/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/
      - copied from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/META-INF/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/services/
      - copied from r537400, jackrabbit/trunk/jackrabbit-core/src/main/java/META-INF/services/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.0.dtd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/repository-1.0.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/config/repository-1.2.dtd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/repository-1.2.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/daffodil.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/daffodil.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/db2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/default.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/derby.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/mssql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/mysql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/oracle.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/fs/db/postgresql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/postgresql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/default.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/derby.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/h2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/mysql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/journal/oracle.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/db2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/derby.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/h2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/mssql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/mysql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/daffodil.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/daffodil.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/db2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/default.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/derby.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/h2.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/mssql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/mysql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/oracle.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/persistence/db/postgresql.ddl
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/postgresql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/indexing-configuration-1.0.dtd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/indexing-configuration-1.0.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.properties
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.properties
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/test-repository.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/cnd-reader-test-input.cnd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/applications/test/cnd-reader-test-input.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/resources/log4j.properties
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/applications/test/log4j.properties
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/config/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/config/repository.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/config/workspace.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_nodetypes.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/repositoryStubImpl.properties
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/applications/test/repositoryStubImpl.properties
    jackrabbit/trunk/jackrabbit-core/src/test/resources/xsd-converter-model-output.cnd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/applications/test/xsd-converter-model-output.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/resources/xsd-converter-test-input.xsd
      - copied unchanged from r537125, jackrabbit/trunk/jackrabbit-core/applications/test/xsd-converter-test-input.xsd
Removed:
    jackrabbit/trunk/jackrabbit-core/applications/test/cnd-reader-test-input.cnd
    jackrabbit/trunk/jackrabbit-core/applications/test/log4j.properties
    jackrabbit/trunk/jackrabbit-core/applications/test/repositoryStubImpl.properties
    jackrabbit/trunk/jackrabbit-core/applications/test/xsd-converter-model-output.cnd
    jackrabbit/trunk/jackrabbit-core/applications/test/xsd-converter-test-input.xsd
    jackrabbit/trunk/jackrabbit-core/src/main/java/META-INF/
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/repository-1.0.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/repository-1.2.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/daffodil.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/postgresql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/daffodil.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/db2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/default.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/derby.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/h2.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/mssql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/mysql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/oracle.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/postgresql.ddl
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/indexing-configuration-1.0.dtd
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.properties
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/test-repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/workspace.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_nodetypes.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_ns_cnd_nodetypes.cnd
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/test_ns_xml_nodetypes.xml
Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?view=diff&rev=537401&r1=537400&r2=537401
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Sat May 12 05:39:00 2007
@@ -37,36 +37,6 @@
   <description>Jackrabbit content repository implementation</description>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*.xml</include>
-          <include>**/*.properties</include>
-          <include>**/*.ddl</include>
-          <include>META-INF/services/*</include>
-          <include>**/*.cnd</include>
-          <include>**/*.dtd</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${basedir}/applications/test</directory>
-        <includes>
-          <include>*.properties</include>
-          <include>*.xml</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>${basedir}/src/test/java</directory>
-        <includes>
-          <include>**/*.cnd</include>
-          <include>**/*.xml</include>
-          <include>**/*.txt</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java?view=diff&rev=537401&r1=537400&r2=537401
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java Sat May 12 05:39:00 2007
@@ -30,13 +30,14 @@
 
 import javax.jcr.PropertyType;
 import javax.jcr.version.OnParentVersionAction;
-import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.List;
 
 public class CompactNodeTypeDefTest extends TestCase {
-    private static final String TEST_FILE = "applications/test/cnd-reader-test-input.cnd";
+    private static final String TEST_FILE = "cnd-reader-test-input.cnd";
     private static final String NS_PREFIX = "ex";
     private static final String NS_URI = "http://example.org/jackrabbit/example";
 
@@ -102,7 +103,10 @@
     public void testCompactNodeTypeDef() throws Exception {
 
         // Read in node type def from test file
-        CompactNodeTypeDefReader cndReader = new CompactNodeTypeDefReader(new FileReader(TEST_FILE), TEST_FILE);
+        Reader reader = new InputStreamReader(
+            getClass().getClassLoader().getResourceAsStream(TEST_FILE));
+        CompactNodeTypeDefReader cndReader =
+            new CompactNodeTypeDefReader(reader, TEST_FILE);
         List ntdList = cndReader.getNodeTypeDefs();
         NamespaceMapping nsm = cndReader.getNamespaceMapping();
         NodeTypeDef ntd = (NodeTypeDef)ntdList.get(0);