exo-jcr SVN: r186 - jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
Author: gavrikvetal
Date: 2009-09-25 06:57:40 -0400 (Fri, 25 Sep 2009)
New Revision: 186
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-160 HttpBackupAgent should return "Restore Info" bean after new restore job is started
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2009-09-25 09:03:45 UTC (rev 185)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2009-09-25 10:57:40 UTC (rev 186)
@@ -437,9 +437,36 @@
BackupChainLog backupChainLog = new BackupChainLog(backupLog);
backupManager.restore(backupChainLog, repository, wEntry, true);
+
+ /*
+ * Sleeping
+ * Restore must be initialized by job thread
+ */
- ShortInfo shortInfo = new ShortInfo(ShortInfo.CURRENT, backupChainLog);
- return Response.ok(shortInfo).cacheControl(noCache).build();
+ Thread.sleep(100);
+
+ /*
+ * search necessary restore
+ */
+
+ List<JobWorkspaceRestore> restoreJobs = backupManager.getRestores();
+ JobWorkspaceRestore restore = null;
+ for (JobWorkspaceRestore curRestore : restoreJobs) {
+ if (curRestore.getRepositoryName().equals(repository) &&
+ curRestore.getWorkspaceName().equals(wEntry.getName())) {
+ restore = curRestore;
+ break;
+ }
+ }
+
+ if (restore != null) {
+ ShortInfo info =
+ new ShortInfo(ShortInfo.RESTORE, restore.getBackupChainLog(), restore.getStartTime(), restore.getEndTime(),
+ restore.getStateRestore(), restore.getRepositoryName(), restore.getWorkspaceName());
+ return Response.ok(info).cacheControl(noCache).build();
+ }
+
+ return Response.ok().cacheControl(noCache).build();
}
catch (WorkspaceRestoreExeption e)
{
14 years, 6 months
exo-jcr SVN: r185 - jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
Author: gavrikvetal
Date: 2009-09-25 05:03:45 -0400 (Fri, 25 Sep 2009)
New Revision: 185
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-160 HttpBackupAgent should return "Restore Info" bean after new restore job is started
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2009-09-25 08:57:39 UTC (rev 184)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2009-09-25 09:03:45 UTC (rev 185)
@@ -18,6 +18,26 @@
*/
package org.exoplatform.services.jcr.ext.backup.server;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.security.RolesAllowed;
+import javax.jcr.LoginException;
+import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -43,26 +63,6 @@
import org.exoplatform.services.log.Log;
import org.exoplatform.services.rest.resource.ResourceContainer;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.security.RolesAllowed;
-import javax.jcr.LoginException;
-import javax.jcr.NoSuchWorkspaceException;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
/**
* Created by The eXo Platform SAS.
*
@@ -410,6 +410,7 @@
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
@Path("/restore/{repo}/{id}")
public Response restore(WorkspaceEntry wEntry, @PathParam("repo") String repository, @PathParam("id") String backupId)
@@ -436,8 +437,9 @@
BackupChainLog backupChainLog = new BackupChainLog(backupLog);
backupManager.restore(backupChainLog, repository, wEntry, true);
-
- return Response.ok().cacheControl(noCache).build();
+
+ ShortInfo shortInfo = new ShortInfo(ShortInfo.CURRENT, backupChainLog);
+ return Response.ok(shortInfo).cacheControl(noCache).build();
}
catch (WorkspaceRestoreExeption e)
{
14 years, 6 months
exo-jcr SVN: r183 - jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-09-23 04:53:55 -0400 (Wed, 23 Sep 2009)
New Revision: 183
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
Log:
EXOJCR-159 : NodeHierarchyCreatorImpl should not use empty paths (2)
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-23 07:35:13 UTC (rev 182)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-23 08:53:55 UTC (rev 183)
@@ -97,29 +97,28 @@
Node node = rootNode;
for (String token : path.split("/"))
{
- if (token.length() == 0)
+ if (token.length() > 0)
{
- continue;
- }
- try
- {
- node = node.getNode(token);
- }
- catch (PathNotFoundException e)
- {
- if (nodeType == null || nodeType.length() == 0)
- nodeType = NT_UNSTRUCTURED;
- node = node.addNode(token, nodeType);
- if (node.canAddMixin("exo:privilegeable"))
- node.addMixin("exo:privilegeable");
- if (permissions != null && !permissions.isEmpty())
- ((ExtendedNode)node).setPermissions(permissions);
- if (mixinTypes.size() > 0)
+ try
{
- for (String mixin : mixinTypes)
+ node = node.getNode(token);
+ }
+ catch (PathNotFoundException e)
+ {
+ if (nodeType == null || nodeType.length() == 0)
+ nodeType = NT_UNSTRUCTURED;
+ node = node.addNode(token, nodeType);
+ if (node.canAddMixin("exo:privilegeable"))
+ node.addMixin("exo:privilegeable");
+ if (permissions != null && !permissions.isEmpty())
+ ((ExtendedNode)node).setPermissions(permissions);
+ if (mixinTypes.size() > 0)
{
- if (node.canAddMixin(mixin))
- node.addMixin(mixin);
+ for (String mixin : mixinTypes)
+ {
+ if (node.canAddMixin(mixin))
+ node.addMixin(mixin);
+ }
}
}
}
14 years, 7 months
exo-jcr SVN: r182 - jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2009-09-23 03:35:13 -0400 (Wed, 23 Sep 2009)
New Revision: 182
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
Log:
EXOJCR-159 : NodeHierarchyCreatorImpl should not use empty paths
Modified: jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
===================================================================
--- jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-22 09:21:51 UTC (rev 181)
+++ jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-23 07:35:13 UTC (rev 182)
@@ -97,6 +97,10 @@
Node node = rootNode;
for (String token : path.split("/"))
{
+ if (token.length() == 0)
+ {
+ continue;
+ }
try
{
node = node.getNode(token);
14 years, 7 months
exo-jcr SVN: r181 - jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-09-22 05:21:51 -0400 (Tue, 22 Sep 2009)
New Revision: 181
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
Log:
EXOJCR-12: JCR cache fix: remove of child Nodes list containing the parent
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-22 09:20:17 UTC (rev 180)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-22 09:21:51 UTC (rev 181)
@@ -1720,8 +1720,7 @@
}
else if (item.getQPath().getName().equals(Constants.EXO_PERMISSIONS))
{
- // TODO JCR-1117 place to put workaround for JCR cache
- // exo:permissions updated
+ // TODO EXOJCR-12 place to put workaround for JCR cache exo:permissions updated
// get parent Node
// check if parent is mix:privilegeable
@@ -1729,7 +1728,9 @@
// delete parent
remove(parent);
-
+ // delete parent containing child nodes list
+ nodesCache.remove(parent.getParentIdentifier());
+
// traverse itemCache
Iterator<CacheValue> cacheIterator = cache.values().iterator();
while (cacheIterator.hasNext())
14 years, 7 months
exo-jcr SVN: r180 - jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-09-22 05:20:17 -0400 (Tue, 22 Sep 2009)
New Revision: 180
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
Log:
EXOJCR-12: dummy commit to mark the changes available for FishEye/JIRA
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-21 07:47:43 UTC (rev 179)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-22 09:20:17 UTC (rev 180)
@@ -1729,9 +1729,7 @@
// delete parent
remove(parent);
- // delete parent containing child nodes list
- nodesCache.remove(parent.getParentIdentifier());
-
+
// traverse itemCache
Iterator<CacheValue> cacheIterator = cache.values().iterator();
while (cacheIterator.hasNext())
14 years, 7 months
exo-jcr SVN: r177 - in jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl: dataflow/persistent and 2 other directories.
by do-not-reply＠jboss.org
Author: skarpenko
Date: 2009-09-17 07:15:56 -0400 (Thu, 17 Sep 2009)
New Revision: 177
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
Log:
JCR-149: LinkedWorkspaceStorageCacheImpl fix
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2009-09-15 15:16:36 UTC (rev 176)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2009-09-17 11:15:56 UTC (rev 177)
@@ -94,7 +94,7 @@
* @throws ValueFormatException
* if the value can not be represented as a <code>String</code> or if the value is
* <code>null</code>.
- * @throws RepositoryException
+ * @throws RepositoryException
* if another error occurs.
*/
protected String getInternalString() throws ValueFormatException, RepositoryException
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-15 15:16:36 UTC (rev 176)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2009-09-17 11:15:56 UTC (rev 177)
@@ -1728,8 +1728,11 @@
ItemData parent = get(item.getParentIdentifier());
// delete parent
remove(parent);
+
+ // delete parent containing child nodes list
+ nodesCache.remove(parent.getParentIdentifier());
+
// traverse itemCache
-
Iterator<CacheValue> cacheIterator = cache.values().iterator();
while (cacheIterator.hasNext())
{
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-09-15 15:16:36 UTC (rev 176)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2009-09-17 11:15:56 UTC (rev 177)
@@ -1,18 +1,20 @@
/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+ * Copyright (C) 2009 eXo Platform SAS.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.exoplatform.services.jcr.impl.storage.jdbc;
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-09-15 15:16:36 UTC (rev 176)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/MultiDbJDBCConnection.java 2009-09-17 11:15:56 UTC (rev 177)
@@ -1,18 +1,20 @@
/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+ * Copyright (C) 2009 eXo Platform SAS.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.exoplatform.services.jcr.impl.storage.jdbc.db;
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-09-15 15:16:36 UTC (rev 176)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/SingleDbJDBCConnection.java 2009-09-17 11:15:56 UTC (rev 177)
@@ -1,18 +1,20 @@
/*
- * Copyright (C) 2003-2007 eXo Platform SAS.
+ * Copyright (C) 2009 eXo Platform SAS.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.exoplatform.services.jcr.impl.storage.jdbc.db;
14 years, 7 months
exo-jcr SVN: r176 - jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2009-09-15 11:16:36 -0400 (Tue, 15 Sep 2009)
New Revision: 176
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexFormatVersion.java
Log:
JCR-1085 : update index version detector
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexFormatVersion.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexFormatVersion.java 2009-09-15 14:58:38 UTC (rev 175)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/IndexFormatVersion.java 2009-09-15 15:16:36 UTC (rev 176)
@@ -19,6 +19,10 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.WildcardQuery;
import java.io.IOException;
import java.util.Collection;
@@ -153,7 +157,26 @@
{
return true;
}
- return false;
+
+ IndexSearcher searcher = new IndexSearcher(indexReader);
+ Query primaryType = new WildcardQuery(new Term(FieldNames.PROPERTIES, "jcr:primaryType[*?"));
+ try
+ {
+
+ try
+ {
+ TopDocs hits = searcher.search(primaryType, 1);
+ return hits.totalHits > 0;
+ }
+ finally
+ {
+ searcher.close();
+ }
+ }
+ catch (IOException e)
+ {
+ return false;
+ }
}
/**
14 years, 7 months
exo-jcr SVN: r175 - ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2009-09-15 10:58:38 -0400 (Tue, 15 Sep 2009)
New Revision: 175
Modified:
ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
Log:
EXOJCR-130 : log error
Modified: ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
===================================================================
--- ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java 2009-09-15 14:32:02 UTC (rev 174)
+++ ws/trunk/rest/core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java 2009-09-15 14:58:38 UTC (rev 175)
@@ -20,6 +20,8 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
import org.exoplatform.services.rest.Connector;
import org.exoplatform.services.rest.ContainerResponseWriter;
import org.exoplatform.services.rest.GenericContainerResponse;
@@ -50,6 +52,8 @@
public class RestServlet extends HttpServlet implements Connector
{
+ private static final Log LOG = ExoLogger.getLogger(RestServlet.class.getName());
+
/**
* Generated by Eclipse.
*/
@@ -103,6 +107,7 @@
}
catch (Exception e)
{
+ LOG.error(e);
throw new ServletException(e);
}
finally
14 years, 7 months