exo-jcr SVN: r125 - in jcr/trunk/component/ext/src: test/java/org/exoplatform/services/jcr/ext/replication and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-09-02 05:44:54 -0400 (Wed, 02 Sep 2009)
New Revision: 125
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java
jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/replication/ReplicationExternalizableTest.java
Log:
EXOJCR-21 : Has been fixed problem with 'javax.jcr.Repository: Illegal relPath'
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java 2009-09-02 09:33:57 UTC (rev 124)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java 2009-09-02 09:44:54 UTC (rev 125)
@@ -135,10 +135,11 @@
String[] sArray = repoPath.split("[::]");
for (String nodeName : sArray)
- if (resultNode.hasNode(nodeName))
- resultNode = resultNode.getNode(nodeName);
- else
- resultNode = resultNode.addNode(nodeName, "nt:unstructured");
+ if(!nodeName.equals(""))
+ if (resultNode.hasNode(nodeName))
+ resultNode = resultNode.getNode(nodeName);
+ else
+ resultNode = resultNode.addNode(nodeName, "nt:unstructured");
return resultNode;
}
Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/replication/ReplicationExternalizableTest.java
===================================================================
--- jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/replication/ReplicationExternalizableTest.java 2009-09-02 09:33:57 UTC (rev 124)
+++ jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/replication/ReplicationExternalizableTest.java 2009-09-02 09:44:54 UTC (rev 125)
@@ -122,10 +122,11 @@
String[] sArray = repoPath.split("[::]");
for (String nodeName : sArray)
- if (resultNode.hasNode(nodeName))
- resultNode = resultNode.getNode(nodeName);
- else
- resultNode = resultNode.addNode(nodeName, "nt:unstructured");
+ if(!nodeName.equals(""))
+ if (resultNode.hasNode(nodeName))
+ resultNode = resultNode.getNode(nodeName);
+ else
+ resultNode = resultNode.addNode(nodeName, "nt:unstructured");
return resultNode;
}
14 years, 8 months
exo-jcr SVN: r124 - jcr/tags/1.12.0-Beta01/applications.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2009-09-02 05:33:57 -0400 (Wed, 02 Sep 2009)
New Revision: 124
Modified:
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml
Log:
EXOJCR-66: replace parent artefactId
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml 2009-09-02 08:39:29 UTC (rev 123)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml 2009-09-02 09:33:57 UTC (rev 124)
@@ -21,7 +21,7 @@
<project>
<parent>
<groupId>org.exoplatform.jcr</groupId>
- <artifactId>jcr-parent</artifactId>
+ <artifactId>exo.jcr.applications.config</artifactId>
<version>1.12.0-Beta01</version>
</parent>
@@ -52,7 +52,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>install</phase>
@@ -66,6 +65,7 @@
<descriptor>product-exo-jcr-as-descriptor.xml</descriptor>
</descriptors>
<finalName>lib</finalName>
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</plugin>
<plugin>
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml 2009-09-02 08:39:29 UTC (rev 123)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml 2009-09-02 09:33:57 UTC (rev 124)
@@ -21,7 +21,7 @@
<project>
<parent>
<groupId>org.exoplatform.jcr</groupId>
- <artifactId>jcr-parent</artifactId>
+ <artifactId>exo.jcr.applications.config</artifactId>
<version>1.12.0-Beta01</version>
</parent>
@@ -40,7 +40,7 @@
<type>ear</type>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -52,7 +52,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>install</phase>
@@ -66,6 +65,7 @@
<descriptor>product-exo-jcr-as-descriptor.xml</descriptor>
</descriptors>
<finalName>lib</finalName>
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</plugin>
<plugin>
14 years, 8 months
exo-jcr SVN: r123 - jcr/tags/1.12.0-Beta01/applications.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2009-09-02 04:39:29 -0400 (Wed, 02 Sep 2009)
New Revision: 123
Modified:
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-66: replace parent artefactId
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-01 15:24:55 UTC (rev 122)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-02 08:39:29 UTC (rev 123)
@@ -21,7 +21,7 @@
<project>
<parent>
<groupId>org.exoplatform.jcr</groupId>
- <artifactId>jcr-parent</artifactId>
+ <artifactId>exo.jcr.applications.config</artifactId>
<version>1.12.0-Beta01</version>
</parent>
@@ -57,6 +57,7 @@
<descriptor>product-exo-jcr-as-descriptor.xml</descriptor>
</descriptors>
<finalName>lib</finalName>
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</plugin>
<plugin>
14 years, 8 months
exo-jcr SVN: r122 - jcr/tags/1.12.0-Beta01/applications.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-09-01 11:24:55 -0400 (Tue, 01 Sep 2009)
New Revision: 122
Modified:
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-66: use inherited version of assembly plugin
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-01 09:45:32 UTC (rev 121)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-01 15:24:55 UTC (rev 122)
@@ -44,7 +44,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<phase>install</phase>
14 years, 8 months
exo-jcr SVN: r121 - in jcr/trunk/component: ext/src/main/java/org/exoplatform/services/jcr/ext/repository and 1 other directories.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-09-01 05:45:32 -0400 (Tue, 01 Sep 2009)
New Revision: 121
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/config/RepositoryEntry.java
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java
jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
Log:
EXOJCR-13 : Has been updated the service RestRepositoryService.
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/config/RepositoryEntry.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/config/RepositoryEntry.java 2009-09-01 08:54:01 UTC (rev 120)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/config/RepositoryEntry.java 2009-09-01 09:45:32 UTC (rev 121)
@@ -46,10 +46,22 @@
{
return workspaces;
}
+
+ /**
+ * Set workspaces.
+ *
+ * @param workspaces
+ * the list of WorkspaceEntry-s
+ */
+ public void setWorkspaceEntries(ArrayList<WorkspaceEntry> workspaces)
+ {
+ this.workspaces = workspaces;
+ }
/**
* adds workspace entry object
* @param ws
+ * the WorkspaceEntry
*/
public void addWorkspace(WorkspaceEntry ws)
{
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java 2009-09-01 08:54:01 UTC (rev 120)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryService.java 2009-09-01 09:45:32 UTC (rev 121)
@@ -175,9 +175,8 @@
}
/**
- * @return
- * @throws RepositoryConfigurationException
- * @throws RepositoryException
+ * @return Response
+ * return the Response with RepositoryServiceConf
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@@ -192,6 +191,12 @@
return Response.ok(conf, MediaType.APPLICATION_JSON_TYPE).cacheControl(NO_CACHE).build();
}
+ /**
+ * @param repositoryName
+ * String, the repository name
+ * @return Response
+ * return the Response with WorkspaceEntry
+ */
@GET
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
@@ -235,9 +240,13 @@
/**
* @param uriInfo
+ * UriInfo, the uri location
* @param newRepository
- * @return
+ * RepositoryEntry, the RepositoryEntry to new repository
+ * @return Response
+ * return the Response
* @throws URISyntaxException
+ * will be generated the URISyntaxException
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -281,10 +290,15 @@
/**
* @param uriInfo
+ * UriInfo, the uri location
* @param repositoryName
+ * String, the repository name
* @param newWorkspace
- * @return
+ * WorkspaceEntry, the WorkspaceEntry to new repository
+ * @return Response
+ * return the Response
* @throws URISyntaxException
+ * will be generated the URISyntaxException
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -330,9 +344,13 @@
/**
* @param uriInfo
+ * UriInfo, the uri location
* @param repositoryName
- * @return
- * @throws URISyntaxException
+ * String, the repository name
+ * @param forseSessionClose
+ * Boolean, flag to force session close
+ * @return Response
+ * return the Response
*/
@POST
@RolesAllowed("administrators")
@@ -378,9 +396,15 @@
/**
* @param uriInfo
+ * UriInfo, the uri location
* @param repositoryName
- * @return
- * @throws URISyntaxException
+ * String, the repository name
+ * @param workspaceName
+ * String, the workspace name
+ * @param forseSessionClose
+ * Boolean, flag to force session close
+ * @return Response
+ * return the Response
*/
@POST
@RolesAllowed("administrators")
@@ -434,7 +458,8 @@
}
/**
- * @return
+ * @return Response
+ * return the Response with list of repository names
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@@ -454,7 +479,9 @@
/**
* @param repositoryName
- * @return
+ * String, the repository name
+ * @return Response
+ * return the Response with list of workspace names
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
@@ -497,6 +524,16 @@
.build();
}
+ /**
+ * * @param repositoryName
+ * String, the repository name
+ * @param workspaceName
+ * String, the workspace name
+ * @param workspaceEntry
+ * WorkspaceEntry, the confg to workspace
+ * @return Response
+ * return the Response
+ */
@POST
@Consumes(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
===================================================================
--- jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2009-09-01 08:54:01 UTC (rev 120)
+++ jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2009-09-01 09:45:32 UTC (rev 121)
@@ -175,24 +175,24 @@
public void testCreateRepository() throws Exception
{
- String wsName = "ws_over_rest";
+ String wsName = "ws_over_rest_1";
String rName = "repo_over_rest";
RepositoryEntry rDefault =
repositoryService.getConfig().getRepositoryConfiguration(
repositoryService.getConfig().getDefaultRepositoryName());
+
RepositoryEntry rEntry = new RepositoryEntry();
- rEntry.setAccessControl(rDefault.getAccessControl());
- rEntry.setAuthenticationPolicy(rDefault.getAuthenticationPolicy());
- rEntry.setDefaultWorkspaceName("ws_over_rest");
rEntry.setName(rName);
- rEntry.setSecurityDomain(rDefault.getSecurityDomain());
- rEntry.setSessionTimeOut(rDefault.getSessionTimeOut());
+ rEntry.setSessionTimeOut(3600000);
+ rEntry.setAuthenticationPolicy("org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator");
+ rEntry.setSecurityDomain("exo-domain");
rEntry.setSystemWorkspaceName(wsName);
+ rEntry.setDefaultWorkspaceName(wsName);
WorkspaceEntry wEntry =
- makeWorkspaceEntry(rDefault.getWorkspaceEntries().get(0), rName, wsName, "jdbcjcr_to_rest_repo", false);
+ makeWorkspaceEntry(rDefault.getWorkspaceEntries().get(0), rName, wsName, "jdbcjcr_to_rest_repo_1", true);
rEntry.addWorkspace(wEntry);
JsonGeneratorImpl generatorImpl = new JsonGeneratorImpl();
@@ -212,18 +212,21 @@
assertEquals(200, cres.getStatus());
- //TODO
- // assertEquals(repositoryService.getConfig().getDefaultRepositoryName(), repositoryConf.getDefaultRepositoryName());
- // assertEquals(repositoryService.getConfig().getRepositoryConfigurations().size(), repositoryConf.getRepositories().size());
+ Session session =
+ repositoryService.getRepository(rName).login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
+ assertNotNull(session);
+ assertNotNull(session.getRootNode());
+ session.logout();
}
public void testCreateWorkspace() throws Exception
{
- String wsName = "ws_over_rest";
+ String wsName = "ws_over_rest_2";
+ String rName = "repo_over_rest";
WorkspaceEntry wEntry =
makeWorkspaceEntry(repositoryService.getDefaultRepository().getConfiguration().getWorkspaceEntries()
- .get(0), "db1", wsName, "jdbcjcr_to_rest_repo_2", true);
+ .get(0), rName, wsName, "jdbcjcr_to_rest_repo_2", true);
JsonGeneratorImpl generatorImpl = new JsonGeneratorImpl();
JsonValue json = generatorImpl.createJsonObject(wEntry);
@@ -234,7 +237,7 @@
ContainerRequestUserRole creq =
new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
+ RestRepositoryService.Constants.OperationType.CREATE_WORKSPACE + "/"
- + repositoryService.getDefaultRepository().getConfiguration().getName()), new URI(""),
+ + rName), new URI(""),
new ByteArrayInputStream(json.toString().getBytes("UTF-8")), new InputHeadersMap(headers));
ByteArrayContainerResponseWriter responseWriter = new ByteArrayContainerResponseWriter();
@@ -244,8 +247,7 @@
assertEquals(200, cres.getStatus());
Session session =
- repositoryService.getDefaultRepository().login(new CredentialsImpl("root", "exo".toCharArray()),
- "ws_over_rest");
+ repositoryService.getRepository(rName).login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
assertNotNull(session);
assertNotNull(session.getRootNode());
@@ -254,85 +256,93 @@
public void testRemoveWorkspace() throws Exception
{
- Session session = repositoryService.getDefaultRepository().login(new CredentialsImpl("root", "exo".toCharArray()),
- "ws_over_rest");
+ String wsName = "ws_over_rest_2";
+ String rName = "repo_over_rest";
+ Session session =
+ repositoryService.getRepository(rName).login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
assertNotNull(session);
assertNotNull(session.getRootNode());
-
- String wsName = "ws_over_rest";
- String repoName = repositoryService.getDefaultRepository().getConfiguration().getName();
MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
ContainerRequestUserRole creq =
new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
- + RestRepositoryService.Constants.OperationType.REMOVE_WORKSPACE + "/"
- + repoName + "/" + wsName + "/false/"), new URI(""), null, new InputHeadersMap(headers));
+ + RestRepositoryService.Constants.OperationType.REMOVE_WORKSPACE + "/" + rName + "/"
+ + wsName + "/false/"), new URI(""), null, new InputHeadersMap(headers));
ByteArrayContainerResponseWriter responseWriter = new ByteArrayContainerResponseWriter();
ContainerResponse cres = new ContainerResponse(responseWriter);
handler.handleRequest(creq, cres);
assertEquals(409, cres.getStatus());
-
+
//remove with prepare close sessions
creq =
- new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
- + RestRepositoryService.Constants.OperationType.REMOVE_WORKSPACE + "/"
- + repoName + "/" + wsName + "/true/"), new URI(""), null, new InputHeadersMap(headers));
+ new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
+ + RestRepositoryService.Constants.OperationType.REMOVE_WORKSPACE + "/" + rName + "/"
+ + wsName + "/true/"), new URI(""), null, new InputHeadersMap(headers));
responseWriter = new ByteArrayContainerResponseWriter();
cres = new ContainerResponse(responseWriter);
handler.handleRequest(creq, cres);
-
+
assertEquals(204, cres.getStatus());
- try {
- repositoryService.getDefaultRepository().login(new CredentialsImpl("root", "exo".toCharArray()), "ws_over_rest");
- fail("The workspace /" + repoName + "/" + wsName + "should be removed. ");
- } catch (NoSuchWorkspaceException e) {
+ try
+ {
+ repositoryService.getRepository(rName).login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
+ fail("The workspace /" + rName + "/" + wsName + "should be removed. ");
+ }
+ catch (NoSuchWorkspaceException e)
+ {
//ok.
}
}
-
+
public void testRemoveRepository() throws Exception
{
String wsName = "ws";
String repoName = "db2";
-
- Session session = repositoryService.getRepository(repoName).login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
+
+ Session session =
+ repositoryService.getRepository(repoName)
+ .login(new CredentialsImpl("root", "exo".toCharArray()), wsName);
assertNotNull(session);
assertNotNull(session.getRootNode());
-
+
MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
ContainerRequestUserRole creq =
- new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
- + RestRepositoryService.Constants.OperationType.REMOVE_REPOSITORY + "/"
- + repoName + "/false/"), new URI(""), null, new InputHeadersMap(headers));
+ new ContainerRequestUserRole("POST",
+ new URI(REST_REPOSITORY_SERVICE_PATH
+ + RestRepositoryService.Constants.OperationType.REMOVE_REPOSITORY + "/" + repoName
+ + "/false/"), new URI(""), null, new InputHeadersMap(headers));
ByteArrayContainerResponseWriter responseWriter = new ByteArrayContainerResponseWriter();
ContainerResponse cres = new ContainerResponse(responseWriter);
handler.handleRequest(creq, cres);
assertEquals(409, cres.getStatus());
-
+
//remove with prepare close sessions
creq =
- new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
- + RestRepositoryService.Constants.OperationType.REMOVE_REPOSITORY + "/"
- + repoName + "/true/"), new URI(""), null, new InputHeadersMap(headers));
+ new ContainerRequestUserRole("POST", new URI(REST_REPOSITORY_SERVICE_PATH
+ + RestRepositoryService.Constants.OperationType.REMOVE_REPOSITORY + "/" + repoName + "/true/"),
+ new URI(""), null, new InputHeadersMap(headers));
responseWriter = new ByteArrayContainerResponseWriter();
cres = new ContainerResponse(responseWriter);
handler.handleRequest(creq, cres);
-
+
assertEquals(204, cres.getStatus());
- try {
- repositoryService.getRepository(repoName);
- fail("The repository /" + repoName + "should be removed. ");
- } catch (RepositoryException e) {
+ try
+ {
+ repositoryService.getRepository(repoName);
+ fail("The repository /" + repoName + "should be removed. ");
+ }
+ catch (RepositoryException e)
+ {
//ok.
}
}
14 years, 8 months
exo-jcr SVN: r120 - jcr/trunk.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-09-01 04:54:01 -0400 (Tue, 01 Sep 2009)
New Revision: 120
Removed:
jcr/trunk/123/
Log:
Removed jcr/trunk/123
14 years, 8 months
exo-jcr SVN: r119 - jcr/trunk.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2009-09-01 04:52:34 -0400 (Tue, 01 Sep 2009)
New Revision: 119
Added:
jcr/trunk/123/
Log:
Created directory 'jcr/trunk/123'.
14 years, 8 months
exo-jcr SVN: r118 - in jcr/tags/1.12.0-Beta01/applications: java/standalone/backupconsole/bin and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-09-01 04:27:25 -0400 (Tue, 01 Sep 2009)
New Revision: 118
Modified:
jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.cmd
jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.sh
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml
jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-1 JCR version in scripts and assemblies updated
Modified: jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.cmd
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.cmd 2009-09-01 08:09:50 UTC (rev 117)
+++ jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.cmd 2009-09-01 08:27:25 UTC (rev 118)
@@ -1 +1 @@
-java -jar exo.jcr.applications.backupconsole-1.12-SNAPSHOT.jar %*
+java -jar exo.jcr.applications.backupconsole-1.12.0-Beta01.jar %*
Modified: jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.sh
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.sh 2009-09-01 08:09:50 UTC (rev 117)
+++ jcr/tags/1.12.0-Beta01/applications/java/standalone/backupconsole/bin/jcrbackup.sh 2009-09-01 08:27:25 UTC (rev 118)
@@ -1,3 +1,3 @@
#!/bin/sh
-java -jar exo.jcr.applications.backupconsole-1.12-SNAPSHOT.jar $*
+java -jar exo.jcr.applications.backupconsole-1.12.0-Beta01.jar $*
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml 2009-09-01 08:09:50 UTC (rev 117)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jboss-ear.xml 2009-09-01 08:27:25 UTC (rev 118)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.12.0-Beta01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml 2009-09-01 08:09:50 UTC (rev 117)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-jonas-ear.xml 2009-09-01 08:27:25 UTC (rev 118)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.12.0-Beta01</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-01 08:09:50 UTC (rev 117)
+++ jcr/tags/1.12.0-Beta01/applications/product-exo-jcr-as-tomcat6.xml 2009-09-01 08:27:25 UTC (rev 118)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 8 months
exo-jcr SVN: r117 - jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2009-09-01 04:09:50 -0400 (Tue, 01 Sep 2009)
New Revision: 117
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java
Log:
EXOJCR-21 : LocationFactory update to show exception more informative (invalid path is now being quoted to show when empty string is given).
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java 2009-08-31 15:06:37 UTC (rev 116)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java 2009-09-01 08:09:50 UTC (rev 117)
@@ -199,12 +199,12 @@
int indexEnd = name.indexOf("]");
if ((indexEnd <= indexStart + 1) || (indexEnd != name.length() - 1))
{
- throw new RepositoryException("Invalid path entry " + name);
+ throw new RepositoryException("Invalid path entry: \"" + name + "\"");
}
index = Integer.parseInt(name.substring(indexStart + 1, indexEnd));
if (index <= 0)
{
- throw new RepositoryException("Invalid path entry " + name);
+ throw new RepositoryException("Invalid path entry: \"" + name + "\"");
}
endOfName = indexStart;
}
@@ -222,7 +222,7 @@
prefix = name.substring(0, delim);
if (!XMLChar.isValidName(prefix))
{
- throw new RepositoryException("Illegal path entry " + name);
+ throw new RepositoryException("Illegal path entry: \"" + name + "\"");
}
}
@@ -230,7 +230,7 @@
String someName = name.substring(delim + 1, endOfName);
if (!isValidName(someName, !prefix.equals("")))
{
- throw new RepositoryException("Illegal path entry " + name);
+ throw new RepositoryException("Illegal path entry: \"" + name + "\"");
}
path.addEntry(namespaces.getNamespaceURIByPrefix(prefix), someName, prefix, index);
@@ -248,7 +248,7 @@
if ((path == null) || (path.equals("")))
{
- throw new RepositoryException("Illegal relPath " + path);
+ throw new RepositoryException("Illegal relPath: \"" + path + "\"");
}
JCRPath jcrPath = new JCRPath();
@@ -261,7 +261,7 @@
{
if (!absolute)
{
- throw new RepositoryException("Illegal relPath " + path);
+ throw new RepositoryException("Illegal relPath: \"" + path + "\"");
}
jcrPath.addEntry(namespaces.getNamespaceURIByPrefix(""), "", "", -1);
}
@@ -269,7 +269,7 @@
{
if (absolute)
{
- throw new RepositoryException("Illegal absPath " + path);
+ throw new RepositoryException("Illegal absPath: \"" + path + "\"");
}
}
@@ -305,7 +305,7 @@
{
if (ch == '|')
{
- log.warn("Path entry " + str + " contain illegal char " + ch);
+ log.warn("Path entry: \"" + str + "\" contain illegal char: \"" + ch + "\"");
}
return !((ch == '\t') || (ch == '\n') || (ch == '\f') || (ch == '\r') || (ch == ' ') || (ch == '/')
14 years, 8 months