<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
<executions>
<execution>
- <phase>validate</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>create</goal>
</goals>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
- <useLastCommittedRevision>true</useLastCommittedRevision>
+ <format>{0,date,yyyyMMdd_HHmmss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ <revisionOnScmFailure>git</revisionOnScmFailure>
+ <providerImplementations>
+ <git>svn</git>
+ </providerImplementations>
</configuration>
</plugin>
<plugin>
<parent>
<groupId>org.argeo.commons</groupId>
<version>0.2.2-SNAPSHOT</version>
- <artifactId>server</artifactId>
+ <artifactId>security</artifactId>
<relativePath>..</relativePath>
</parent>
<groupId>org.argeo.commons.security</groupId>
<groupId>edu.oswego.cs.concurrent</groupId>
<artifactId>com.springsource.edu.oswego.cs.dl.util.concurrent</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>com.springsource.org.apache.derby</artifactId>
- </dependency>
<!-- For webdav -->
<dependency>
<version>0.2.2-SNAPSHOT</version>
</dependency>
- <!-- Jack Rabbit -->
+ <!-- Jackrabbit -->
<dependency>
<groupId>org.argeo.commons.server</groupId>
<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.junit</artifactId>
- <optional>true</optional>
- </dependency>
-
<!-- TEST -->
<dependency>
<groupId>org.argeo.commons.basic</groupId>
+++ /dev/null
-/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.argeo.server.jackrabbit.unit;
-
-import java.io.File;
-
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.core.TransientRepository;
-import org.argeo.ArgeoException;
-
-public abstract class AbstractJcrTestCase extends TestCase {
- private final static Log log = LogFactory.getLog(AbstractJcrTestCase.class);
-
- private TransientRepository repository;
- private Session session = null;
-
- protected abstract File getRepositoryFile() throws Exception;
-
- @Override
- protected void setUp() throws Exception {
- File homeDir = new File(System.getProperty("java.io.tmpdir"),
- AbstractJcrTestCase.class.getSimpleName() + "-"
- + System.getProperty("user.name"));
- FileUtils.deleteDirectory(homeDir);
- repository = new TransientRepository(getRepositoryFile(), homeDir);
- }
-
- @Override
- protected void tearDown() throws Exception {
- if (session != null) {
- session.logout();
- if (log.isDebugEnabled())
- log.debug("Logout session");
- }
- }
-
- protected Session session() {
- if (session == null) {
- try {
- if (log.isDebugEnabled())
- log.debug("Login session");
- session = getRepository().login(
- new SimpleCredentials("demo", "demo".toCharArray()));
- } catch (Exception e) {
- throw new ArgeoException("Cannot login to repository", e);
- }
- }
- return session;
- }
-
- protected Repository getRepository() {
- return repository;
- }
-}
com.springsource.org.apache.xml.serializer,\
com.springsource.org.apache.commons.dbcp,\
com.springsource.org.apache.commons.pool,\
+ org.argeo.dep.osgi.jackrabbit
<version>0.2.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>com.springsource.org.apache.derby</artifactId>
+ </dependency>
<dependency>
<groupId>org.argeo.commons.basic</groupId>
<artifactId>org.argeo.support.junit</artifactId>
--- /dev/null
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.argeo.jcr.unit;
+
+import java.io.File;
+
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.ArgeoException;
+
+public abstract class AbstractJcrTestCase extends TestCase {
+ private final static Log log = LogFactory.getLog(AbstractJcrTestCase.class);
+
+ private Repository repository;
+ private Session session = null;
+
+ protected abstract File getRepositoryFile() throws Exception;
+
+ protected abstract Repository createRepository() throws Exception;
+
+ @Override
+ protected void setUp() throws Exception {
+ File homeDir = getHomeDir();
+ FileUtils.deleteDirectory(homeDir);
+ repository = createRepository();
+ }
+
+ protected File getHomeDir() {
+ File homeDir = new File(System.getProperty("java.io.tmpdir"),
+ AbstractJcrTestCase.class.getSimpleName() + "-"
+ + System.getProperty("user.name"));
+ return homeDir;
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (session != null) {
+ session.logout();
+ if (log.isDebugEnabled())
+ log.debug("Logout session");
+ }
+ }
+
+ protected Session session() {
+ if (session == null) {
+ try {
+ if (log.isDebugEnabled())
+ log.debug("Login session");
+ session = getRepository().login(
+ new SimpleCredentials("demo", "demo".toCharArray()));
+ } catch (Exception e) {
+ throw new ArgeoException("Cannot login to repository", e);
+ }
+ }
+ return session;
+ }
+
+ protected Repository getRepository() {
+ return repository;
+ }
+}
import java.io.File;
import javax.jcr.Node;
+import javax.jcr.Repository;
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.apache.jackrabbit.core.TransientRepository;
+import org.argeo.jcr.unit.AbstractJcrTestCase;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
return res.getFile();
}
+ protected Repository createRepository() throws Exception{
+ Repository repository = new TransientRepository(getRepositoryFile(), getHomeDir());
+ return repository;
+ }
+
+
}
import java.util.Calendar;
import java.util.List;
+import javax.jcr.Repository;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jackrabbit.core.TransientRepository;
import org.argeo.jcr.JcrResourceAdapter;
-import org.argeo.server.jackrabbit.unit.AbstractJcrTestCase;
+import org.argeo.jcr.unit.AbstractJcrTestCase;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
return res.getFile();
}
+ protected Repository createRepository() throws Exception {
+ Repository repository = new TransientRepository(getRepositoryFile(),
+ getHomeDir());
+ return repository;
+ }
+
}