Author: pnedonosko Date: 2009-10-21 06:05:57 -0400 (Wed, 21 Oct 2009) New Revision: 324 Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java jcr/trunk/component/ext/test.cmd Log: EXOJCR-165: move non-java files from src to resources Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java =================================================================== --- jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 09:45:18 UTC (rev 323) +++ jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 10:05:57 UTC (rev 324) @@ -109,20 +109,20 @@ public void setUp() throws Exception { -// String containerConf = getClass().getResource("conf/standalone/test-configuration.xml").toString(); - StandaloneContainer.addConfigurationPath("/conf/standalone/test-configuration.xml"); - String loginConf = Thread.currentThread().getContextClassLoader().getResource("login.conf").toString(); + String containerConf = BaseStandaloneTest.class.getResource("/conf/standalone/test-configuration.xml").toString(); -// StandaloneContainer.addConfigurationURL(containerConf); + StandaloneContainer.addConfigurationURL(containerConf); + container = StandaloneContainer.getInstance(); if (System.getProperty("java.security.auth.login.config") == null) - System.setProperty("java.security.auth.login.config", loginConf); + System.setProperty("java.security.auth.login.config", Thread.currentThread().getContextClassLoader() + .getResource("login.conf").toString()); credentials = new CredentialsImpl("root", "exo".toCharArray()); repositoryService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class); - // container.start(); + repository = (RepositoryImpl)repositoryService.getDefaultRepository(); session = (SessionImpl)repository.login(credentials, WS_NAME); Modified: jcr/trunk/component/ext/test.cmd =================================================================== --- jcr/trunk/component/ext/test.cmd 2009-10-21 09:45:18 UTC (rev 323) +++ jcr/trunk/component/ext/test.cmd 2009-10-21 10:05:57 UTC (rev 324) @@ -1,3 +1,3 @@ -@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false -Dexo.tck.skip=true -Dexo.devtest.skip=true -DforkMode=once +@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false -DforkMode=once @start mvn clean test \ No newline at end of file