cmailleux 2005/05/17 15:38:48 CEST
Modified files: (Branch: JAHIA-HIBERNATE-BRANCH)
core/src/java/org/apache/slide/webdav JahiaWebdavServlet.java
core/src/java/org/jahia/engines/shared Application_Field.java
core/src/java/org/jahia/hibernate/dao
JahiaApplicationShareDAO.java
JahiaContainerDAO.java
JahiaContainerListDAO.java
core/src/java/org/jahia/hibernate/manager
JahiaApplicationManager.java
JahiaContainerListManager.java
JahiaLockManager.java
core/src/java/org/jahia/hibernate/model JahiaFieldsDef.java
JahiaPagesDef.java
core/src/java/org/jahia/services/htmlparser
HtmlParserBaseService.java
core/src/java/org/jahia/services/usermanager
JahiaGroupManagerRoutingService.java
core/src/test/etc/spring applicationContext-hibernate.xml
applicationContext-manager.xml
core/src/test/etc oscache.properties
core/src/test/src/java/org/jahia/hibernate/dao
JahiaContainerListDAOTest.java
Removed files: (Branch: JAHIA-HIBERNATE-BRANCH)
core/src/java/org/jahia/services/categories CategoryDB.java
Log:
no message
Revision Changes Path
1.4.2.2 +6 -5
jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java.diff?r1=1.4.2.1&r2=1.4.2.2&f=h
1.7.2.2 +13 -7
jahia/core/src/java/org/jahia/engines/shared/Application_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java.diff?r1=1.7.2.1&r2=1.7.2.2&f=h
1.1.2.2 +1 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationShareDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaApplicationShareDAO.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.7 +1 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java.diff?r1=1.1.2.6&r2=1.1.2.7&f=h
1.1.2.5 +72 -1
jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/dao/JahiaContainerListDAO.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.1.2.2 +3 -1
jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaApplicationManager.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.3 +17 -9
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerListManager.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.3 +11 -8
jahia/core/src/java/org/jahia/hibernate/manager/JahiaLockManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaLockManager.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.5 +1 -2
jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaFieldsDef.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.1.2.4 +1 -2
jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaPagesDef.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
1.1.2.1 +0 -248
jahia/core/src/java/org/jahia/services/categories/CategoryDB.java (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/categories/CategoryDB.java?rev=1.1&content-type=text/plain
1.4.2.2 +6 -1
jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java.diff?r1=1.4.2.1&r2=1.4.2.2&f=h
1.3.2.1 +1 -1
jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerRoutingService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerRoutingService.java.diff?r1=1.3&r2=1.3.2.1&f=h
1.1.2.2 +1 -1 jahia/core/src/test/etc/oscache.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/etc/oscache.properties.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.7 +2 -2
jahia/core/src/test/etc/spring/applicationContext-hibernate.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/etc/spring/applicationContext-hibernate.xml.diff?r1=1.1.2.6&r2=1.1.2.7&f=h
1.1.2.6 +0 -3
jahia/core/src/test/etc/spring/applicationContext-manager.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/etc/spring/applicationContext-manager.xml.diff?r1=1.1.2.5&r2=1.1.2.6&f=h
1.1.2.3 +5 -10
jahia/core/src/test/src/java/org/jahia/hibernate/dao/JahiaContainerListDAOTest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/test/src/java/org/jahia/hibernate/dao/JahiaContainerListDAOTest.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
Index: JahiaWebdavServlet.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- JahiaWebdavServlet.java 9 Feb 2005 10:37:55 -0000 1.4.2.1
+++ JahiaWebdavServlet.java 17 May 2005 13:38:44 -0000 1.4.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
1.4.2.1 2005/02/09 10:37:55 cmailleux Exp $
- * $Revision: 1.4.2.1 $
- * $Date: 2005/02/09 10:37:55 $
+ * $Header:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java,v
1.4.2.2 2005/05/17 13:38:44 cmailleux Exp $
+ * $Revision: 1.4.2.2 $
+ * $Date: 2005/05/17 13:38:44 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
* @author Dirk Verbeeck
* @author <a href="mailto:[EMAIL PROTECTED]">Christopher Lenz</a>
- * @version $Revision: 1.4.2.1 $
+ * @version $Revision: 1.4.2.2 $
*/
public class JahiaWebdavServlet
extends HttpServlet {
@@ -285,7 +285,8 @@
} else {
try {
DirectoryIndexGenerator directoryIndexGenerator = new
DirectoryIndexGenerator(token, (WebdavServletConfig) getServletConfig());
- directoryIndexGenerator.generate(req, res);
+ SlideToken slideToken = new
SlideTokenWrapper(WebdavUtils.getSlideToken(req));
+ directoryIndexGenerator.generate(req, res,slideToken);
} catch (AccessDeniedException e) {
res.addHeader("WWW-Authenticate", "BASIC realm=\"" +
((NamespaceAccessToken)
req.getAttribute(HttpRequestWrapper.TOKEN_ATTRIBUTE)).getName() + "\"");
res.sendError(HttpServletResponse.SC_UNAUTHORIZED);
Index: Application_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Application_Field.java 15 Apr 2005 09:12:30 -0000 1.7.2.1
+++ Application_Field.java 17 May 2005 13:38:44 -0000 1.7.2.2
@@ -139,7 +139,7 @@
}
appRoleMembers.put(oldAppID, roleMembersList);
engineMap.put(APPLICATION_ROLES, appRoleMembers);
-
+ if(fieldValue!=null) {
int separatorPos = fieldValue.indexOf("_");
if (separatorPos != -1) {
String appIDStr = fieldValue.substring(0, separatorPos);
@@ -149,7 +149,7 @@
engineMap.put( theField.getDefinition().getName() +
"_selectedEntryPointDefName", selectedEntryPointDefName);
engineMap.put( theField.getDefinition().getName() + "_appID",
new Integer(selectedAppID));
}
-
+ }
return true;
}
@@ -365,11 +365,11 @@
if (authAppList == null) { authAppList = new Vector(); }
engineMap.put( "appList", authAppList.elements() );
-
+ int appID = -1;
+ if(authAppList.size()>0) {
Integer entryPointInstanceID = new Integer(-1);
String selectedEntryPointDefName = null;
ApplicationBean appBean = null;
- int appID = -1;
try {
String fieldValue = theField.getRawValue();
// fieldValue could contain appID_defName if we come from an
@@ -397,9 +397,14 @@
if (epInstance == null) {
appBean = (ApplicationBean) authAppList.get(0);
appID = appBean.getID();
- EntryPointDefinition epDef = (EntryPointDefinition) appBean.
-
getEntryPointDefinitions().get(0);
- selectedEntryPointDefName = epDef.getName();
+ EntryPointDefinition epDef = null;
+ ArrayList entryPointDefinitions =
appBean.getEntryPointDefinitions();
+ if(entryPointDefinitions.size()>0) {
+ epDef = (EntryPointDefinition)
entryPointDefinitions.get(0);
+ selectedEntryPointDefName = epDef.getName();
+ } else {
+ selectedEntryPointDefName = appBean.getName();
+ }
} else {
selectedEntryPointDefName = epInstance.getDefName();
appID = epInstance.getApplicationID();
@@ -411,6 +416,7 @@
selectedEntryPointDefName);
engineMap.put(theField.getDefinition().getName() + "_appID", new
Integer(appID));
}
+ }
Vector roles = new Vector();
if (appID >= 0) {
WebAppContext appContext = ServicesRegistry.getInstance().
Index: JahiaApplicationShareDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/Attic/JahiaApplicationShareDAO.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JahiaApplicationShareDAO.java 15 Apr 2005 09:12:31 -0000 1.1.2.1
+++ JahiaApplicationShareDAO.java 17 May 2005 13:38:45 -0000 1.1.2.2
@@ -28,7 +28,7 @@
final HibernateTemplate template = getHibernateTemplate();
template.setCacheQueries(true);
retList = template.find("select distinct a.comp_id.site.id from
JahiaAppsShare a " +
- "where a.comp_id.id=?",new
Object[]{applicationId},
+ "where
a.comp_id.definition.id=?",new Object[]{applicationId},
new
Type[]{TypeFactory.basic(Integer.class.getName())});
if(!(retList.size()>0)) {
throw new ObjectRetrievalFailureException("Couldnot find
site id for application id",applicationId);
Index: JahiaContainerDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/Attic/JahiaContainerDAO.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- JahiaContainerDAO.java 28 Apr 2005 13:00:52 -0000 1.1.2.6
+++ JahiaContainerDAO.java 17 May 2005 13:38:45 -0000 1.1.2.7
@@ -347,7 +347,7 @@
public List getNonDeletedStagingContainerIdsFromList(Integer listId) {
List retVal = null;
StringBuffer hql = new StringBuffer("select distinct
c.comp_id.id,c.comp_id.versionId from JahiaContainer c ");
- hql.append("where c.comp_id.workflowState>=1 and c.listid=? and
c.comp_id.versionId <> -1");
+ hql.append("where c.comp_id.workflowState>=1 and c.listid=? and
c.comp_id.versionId <> -1 ");
hql.append("order by c.rank,c.comp_id.id,c.comp_id.workflowState
desc");
if (listId != null) {
final HibernateTemplate template = getHibernateTemplate();
Index: JahiaContainerListDAO.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/dao/Attic/JahiaContainerListDAO.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JahiaContainerListDAO.java 28 Apr 2005 13:00:52 -0000 1.1.2.4
+++ JahiaContainerListDAO.java 17 May 2005 13:38:45 -0000 1.1.2.5
@@ -129,6 +129,20 @@
return retval;
}
+ public List getAllContainerListIds(Integer pageID) {
+ List retval = null;
+ StringBuffer hql = new StringBuffer(
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.pageid=? and l.parentId is null");
+ hql.append(" order by l.comp_id.id asc");
+ if (pageID != null ) {
+ final HibernateTemplate template = getHibernateTemplate();
+ template.setCacheQueries(true);
+ retval = template.find(hql.toString(), new Object[]{pageID},
+ new
Type[]{TypeFactory.basic(Integer.class.getName())});
+ }
+ return retval;
+ }
+
public Map getAllContainerListIdsForAllContainerInPage(Integer pageId) {
Map retval = null;
StringBuffer hql = new StringBuffer(
@@ -216,6 +230,20 @@
return retval;
}
+ public List getAllStagingContainerListIds(Integer pageID) {
+ List retval = null;
+ StringBuffer hql = new StringBuffer(
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.pageid=? and l.parentId is null and l.comp_id.workflowState>0");
+ hql.append(" order by l.comp_id.id asc, l.comp_id.workflowState
desc");
+ if (pageID != null) {
+ final HibernateTemplate template = getHibernateTemplate();
+ template.setCacheQueries(true);
+ retval = template.find(hql.toString(), new Object[]{pageID},
+ new
Type[]{TypeFactory.basic(Integer.class.getName())});
+ }
+ return retval;
+ }
+
public List getAllSubContainerListIds(Integer parentId) {
List retval = null;
StringBuffer hql = new StringBuffer(
@@ -357,6 +385,20 @@
return retval;
}
+ public List getNonDeletedStagingContainerListIds(Integer pageID) {
+ List retval = null;
+ StringBuffer hql = new StringBuffer(
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.pageid=? and l.parentId is null and l.comp_id.workflowState>0 and
l.comp_id.versionId>-1");
+ hql.append(" order by l.comp_id.id asc, l.comp_id.workflowState
desc");
+ if (pageID != null) {
+ final HibernateTemplate template = getHibernateTemplate();
+ template.setCacheQueries(true);
+ retval = template.find(hql.toString(), new Object[]{pageID},
+ new
Type[]{TypeFactory.basic(Integer.class.getName())});
+ }
+ return retval;
+ }
+
public List getNonDeletedStagingListByPageAndDefinitionID(Integer
pageID, Integer defID) {
List retval = null;
StringBuffer hql = new StringBuffer(
@@ -401,6 +443,20 @@
return retval;
}
+ public List getPublishedContainerListIds(Integer pageID) {
+ List retval = null;
+ StringBuffer hql = new StringBuffer(
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.pageid=? and l.parentId is null and l.comp_id.workflowState=1");
+ hql.append(" order by l.comp_id.id asc");
+ if (pageID != null) {
+ final HibernateTemplate template = getHibernateTemplate();
+ template.setCacheQueries(true);
+ retval = template.find(hql.toString(), new Object[]{pageID},
+ new
Type[]{TypeFactory.basic(Integer.class.getName())});
+ }
+ return retval;
+ }
+
public List getPublishedListByDefinitionID(Integer defID) {
List retval = null;
StringBuffer hql = new StringBuffer(
@@ -473,10 +529,25 @@
return retval;
}
+ public List getVersionedContainerListIds(Integer pageID, Integer
version) {
+ List retval = null;
+ StringBuffer hql = new StringBuffer(
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.pageid=? and l.parentId is null and l.comp_id.workflowState<=1 and
l.comp_id.versionId<=? and l.comp_id.versionId>-1");
+ hql.append(" order by l.comp_id.id asc, l.comp_id.versionId desc");
+ if (pageID != null && version != null) {
+ final HibernateTemplate template = getHibernateTemplate();
+ template.setCacheQueries(true);
+ retval = template.find(hql.toString(), new Object[]{pageID,
version},
+ new
Type[]{TypeFactory.basic(Integer.class.getName()), TypeFactory.basic(
+ Integer.class.getName())});
+ }
+ return retval;
+ }
+
public List getVersionedListByDefinitionID(Integer defID, Integer
version) {
List retval = null;
StringBuffer hql = new StringBuffer(
- "select distinct l.comp_id.id from JahiaContainerList l
where l.parentId=0 and l.containerDefinition.id=? and
l.comp_id.workflowState<=1 and l.comp_id.versionId<=? and
l.comp_id.versionId>-1");
+ "select distinct l.comp_id.id from JahiaContainerList l
where l.parentId is null and l.containerDefinition.id=? and
l.comp_id.workflowState<=1 and l.comp_id.versionId<=? and
l.comp_id.versionId>-1");
hql.append(" order by l.comp_id.id asc");
if (defID != null && version != null) {
final HibernateTemplate template = getHibernateTemplate();
Index: JahiaApplicationManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/Attic/JahiaApplicationManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JahiaApplicationManager.java 15 Apr 2005 09:12:32 -0000 1.1.2.1
+++ JahiaApplicationManager.java 17 May 2005 13:38:45 -0000 1.1.2.2
@@ -69,7 +69,8 @@
}
private ApplicationBean convertJahiaAppDefToApplicationBean(JahiaAppDef
appDef) {
- ApplicationBean applicationBean;
+ ApplicationBean applicationBean = null;
+ if(appDef!=null) {
applicationBean = new ApplicationBean(appDef.getId().intValue(),
appDef.getSite().getId().intValue(),
appDef.getName(),
appDef.getContext(),
@@ -78,6 +79,7 @@
appDef.getJahiaAcl().getId().intValue(),
appDef.getFilename(),
appDef.getDescription(),
appDef.getType());
+ }
return applicationBean;
}
Index: JahiaContainerListManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/Attic/JahiaContainerListManager.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JahiaContainerListManager.java 3 Mar 2005 16:06:49 -0000 1.1.2.2
+++ JahiaContainerListManager.java 17 May 2005 13:38:45 -0000 1.1.2.3
@@ -159,7 +159,7 @@
}
public Collection getAllPageTopLevelContainerListIDs(int pageID) {
- return dao.getAllContainerListIds(new Integer(pageID), new
Integer(0));
+ return dao.getAllContainerListIds(new Integer(pageID));
}
public ContentContainerList getContainerList(int containerListID) {
@@ -231,19 +231,21 @@
public List getPageTopLevelContainerListIDs(int pageID, EntryLoadRequest
request) {
List retval = null;
try {
- if (request != null && !request.isCurrent()) {
+ if (request != null) {
if (request.isStaging()) {
if (request.isWithMarkedForDeletion()) {
- retval =
dao.getNonDeletedStagingContainerListIds(new Integer(pageID), new Integer(0));
+ retval =
dao.getNonDeletedStagingContainerListIds(new Integer(pageID));
} else {
- retval = dao.getAllContainerListIds(new
Integer(pageID), new Integer(0));
+ retval = dao.getAllContainerListIds(new
Integer(pageID));
}
} else if (request.isVersioned()) {
- retval = dao.getVersionedContainerListIds(new
Integer(pageID), new Integer(0),
+ retval = dao.getVersionedContainerListIds(new
Integer(pageID),
new
Integer(request.getVersionID()));
+ } else if(request.isCurrent()) {
+ retval = dao.getPublishedContainerListIds(new
Integer(pageID));
}
} else {
- retval = dao.getPublishedContainerListIds(new
Integer(pageID), new Integer(0));
+ retval = dao.getAllContainerListIds(new Integer(pageID));
}
} catch (ObjectRetrievalFailureException e) {
log.warn("ContainerList not found for pageId = " + pageID, e);
@@ -264,9 +266,11 @@
} else if (request.isVersioned()) {
retval = dao.getVersionedSubContainerListIds(new
Integer(containerID),
new
Integer(request.getVersionID()));
+ } else {
+ retval = dao.getPublishedSubContainerListIds(new
Integer(containerID));
}
} else {
- retval = dao.getPublishedSubContainerListIds(new
Integer(containerID));
+ retval = dao.getAllSubContainerListIds(new
Integer(containerID));
}
} catch (ObjectRetrievalFailureException e) {
log.warn("ContainerList not found for containerID = " +
containerID, e);
@@ -423,7 +427,9 @@
}
dao.deleteContainerLists(dao.loadStagingContainerLists(new
Integer(containerId)));
} else {
- dao.deleteContainerList(dao.loadPublishedContainerList(new
Integer(containerId)));
+ JahiaContainerList publishedContainer =
dao.loadPublishedContainerList(new Integer(containerId));
+ if(publishedContainer!= null)
+ dao.deleteContainerList(publishedContainer);
try {
JahiaContainerList jahiaContainer = (JahiaContainerList)
container.clone();
jahiaContainer.getComp_id().setVersionId(new
Long(saveVersion.getVersionID()));
@@ -432,7 +438,9 @@
} catch (CloneNotSupportedException e) {
log.error("Could not clone
org.jahia.hibernate.model.JahiaContainer");
}
- dao.deleteContainerLists(dao.loadStagedContainerLists(new
Integer(containerId)));
+ List stagedContainers = dao.loadStagedContainerLists(new
Integer(containerId));
+ if(stagedContainers!=null && stagedContainers.size()>0)
+ dao.deleteContainerLists(stagedContainers);
}
}
}
Index: JahiaLockManager.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/Attic/JahiaLockManager.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JahiaLockManager.java 28 Apr 2005 12:57:45 -0000 1.1.2.2
+++ JahiaLockManager.java 17 May 2005 13:38:45 -0000 1.1.2.3
@@ -51,19 +51,22 @@
public Lock getLock(LockKey lockKey) {
Lock lock = null;
try {
- JahiaLock jahiaLock = dao.findByPK(
- new JahiaLockPK(lockKey.getName(), new
Integer(lockKey.getId()), lockKey.getAction()));
- JahiaUser owner =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(jahiaLock.getOwner());
- lock = new Lock(owner, jahiaLock.getContextID(),
jahiaLock.getTimeout().intValue(),
-
Boolean.getBoolean(jahiaLock.getStolen()));
- } catch(Exception e) {
-
+ JahiaLock jahiaLock = dao.findByPK(new
JahiaLockPK(lockKey.getName(), new Integer(lockKey.getId()),
lockKey.getAction()));
+ JahiaUser owner =
ServicesRegistry.getInstance().getJahiaUserManagerService().lookupUser(jahiaLock.getOwner());
+ lock = new Lock(owner, jahiaLock.getContextID(),
jahiaLock.getTimeout().intValue(),
+ Boolean.getBoolean(jahiaLock.getStolen()));
+ } catch (Exception e) {
+
}
return lock;
}
public void remove(LockKey lockKey) {
- dao.delete(dao.findByPK(new JahiaLockPK(lockKey.getName(), new
Integer(lockKey.getId()), lockKey.getAction())));
+ try {
+ dao.delete(dao.findByPK(new JahiaLockPK(lockKey.getName(), new
Integer(lockKey.getId()), lockKey.getAction())));
+ } catch (Exception e) {
+
+ }
}
public void removeAllLocks() {
Index: JahiaFieldsDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/Attic/JahiaFieldsDef.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- JahiaFieldsDef.java 15 Apr 2005 09:12:34 -0000 1.1.2.4
+++ JahiaFieldsDef.java 17 May 2005 13:38:46 -0000 1.1.2.5
@@ -55,8 +55,7 @@
}
/**
- * @hibernate.many-to-one update="false" not-null="false"
- * insert="false"
+ * @hibernate.many-to-one not-null="false"
* @hibernate.column name="jahiaid_jahia_fields_def"
*/
public org.jahia.hibernate.model.JahiaSite getJahiaSite() {
Index: JahiaPagesDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/Attic/JahiaPagesDef.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JahiaPagesDef.java 7 Mar 2005 10:32:51 -0000 1.1.2.3
+++ JahiaPagesDef.java 17 May 2005 13:38:46 -0000 1.1.2.4
@@ -104,8 +104,7 @@
}
/**
- * @hibernate.many-to-one update="false"
- * insert="false" cascade="none"
+ * @hibernate.many-to-one cascade="none"
* @hibernate.column name="jahiaid_jahia_pages_def"
*/
public JahiaSite getSite() {
Index: HtmlParserBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/htmlparser/HtmlParserBaseService.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- HtmlParserBaseService.java 28 Apr 2005 13:00:58 -0000 1.4.2.1
+++ HtmlParserBaseService.java 17 May 2005 13:38:46 -0000 1.4.2.2
@@ -28,10 +28,13 @@
import org.jahia.settings.SettingsBean;
import org.jahia.utils.properties.PropertiesManager;
import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.ApplicationContext;
+
import java.util.Properties;
import org.jahia.bin.JahiaConfig;
import org.jahia.hibernate.manager.JahiaMarkupManager;
import org.jahia.hibernate.manager.JahiaMarkupDefinitionManager;
+import org.jahia.hibernate.manager.SpringContextSingleton;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,7 +70,9 @@
throws JahiaInitializationException {
this.jSettings = jSettings;
-
+ ApplicationContext context =
SpringContextSingleton.getInstance().getContext();
+ markupManager = (JahiaMarkupManager)
context.getBean(JahiaMarkupManager.class.getName());
+ definitionManager = (JahiaMarkupDefinitionManager)
context.getBean(JahiaMarkupDefinitionManager.class.getName());
this.parser = loadHtmlParser();
}
Index: JahiaGroupManagerRoutingService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaGroupManagerRoutingService.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JahiaGroupManagerRoutingService.java 14 Jan 2005 14:43:19 -0000
1.3
+++ JahiaGroupManagerRoutingService.java 17 May 2005 13:38:46 -0000
1.3.2.1
@@ -673,7 +673,7 @@
Vector resultVector = (Vector) result;
Enumeration resultEnum = resultVector.elements ();
while (resultEnum.hasMoreElements ()) {
- Vector curResult = (Vector) resultEnum.nextElement ();
+ List curResult = (List) resultEnum.nextElement ();
groupNameList.addAll (curResult);
}
return groupNameList;
Index: applicationContext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/etc/spring/Attic/applicationContext-hibernate.xml,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- applicationContext-hibernate.xml 28 Apr 2005 13:01:03 -0000 1.1.2.6
+++ applicationContext-hibernate.xml 17 May 2005 13:38:47 -0000 1.1.2.7
@@ -113,9 +113,9 @@
<props>
<prop
key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
<!-- <prop
key="hibernate.dialect">net.sf.hibernate.dialect.HSQLDialect</prop>-->
- <prop key="hibernate.hbm2ddl.auto">create-drop</prop>
+ <prop key="hibernate.hbm2ddl.auto">none</prop>
<prop key="hibernate.show_sql">true</prop>
- <prop key="hibernate.cache.use_query_cache">true</prop>
+ <prop key="hibernate.cache.use_query_cache">false</prop>
<prop key="hibernate.jdbc.batch_size">30</prop>
<prop key="hibernate.query.substitutions">true 1, false
0</prop>
</props>
Index: applicationContext-manager.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/etc/spring/Attic/applicationContext-manager.xml,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- applicationContext-manager.xml 28 Apr 2005 13:01:03 -0000 1.1.2.5
+++ applicationContext-manager.xml 17 May 2005 13:38:47 -0000 1.1.2.6
@@ -273,9 +273,6 @@
<property name="jahiaCategoryDAO">
<ref bean="jahiaCategoryDAO"/>
</property>
- <property name="jahiaAclDAO">
- <ref bean="jahiaAclDAO"/>
- </property>
</bean>
</property>
</bean>
Index: oscache.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/etc/Attic/oscache.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- oscache.properties 9 Feb 2005 10:47:50 -0000 1.1.2.1
+++ oscache.properties 17 May 2005 13:38:47 -0000 1.1.2.2
@@ -72,7 +72,7 @@
# the cache size must also be specified. If the cache size is not specified,
# the cache algorithm will be Unlimited cache.
#
-# cache.algorithm=com.opensymphony.oscache.base.algorithm.LRUCache
+cache.algorithm=com.opensymphony.oscache.base.algorithm.LRUCache
# cache.algorithm=com.opensymphony.oscache.base.algorithm.FIFOCache
# cache.algorithm=com.opensymphony.oscache.base.algorithm.UnlimitedCache
Index: JahiaContainerListDAOTest.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/test/src/java/org/jahia/hibernate/dao/Attic/JahiaContainerListDAOTest.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JahiaContainerListDAOTest.java 28 Apr 2005 13:01:04 -0000 1.1.2.2
+++ JahiaContainerListDAOTest.java 17 May 2005 13:38:47 -0000 1.1.2.3
@@ -12,6 +12,7 @@
import org.jahia.hibernate.model.JahiaCtnListPK;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.jmock.cglib.MockObjectTestCase;
import java.util.List;
import java.util.Map;
@@ -23,7 +24,7 @@
* @version 1.0
* @since <pre>01/06/2005</pre>
*/
-public class JahiaContainerListDAOTest extends TestCase {
+public class JahiaContainerListDAOTest extends MockObjectTestCase {
// ------------------------------ FIELDS ------------------------------
protected ApplicationContext ctx = null;
@@ -31,12 +32,6 @@
private final Integer version = new Integer(999999999);
private JahiaContainerListDAO dao = null;
-// -------------------------- STATIC METHODS --------------------------
-
- public static Test suite() {
- return new TestSuite(JahiaContainerListDAOTest.class);
- }
-
// --------------------------- CONSTRUCTORS ---------------------------
public JahiaContainerListDAOTest() {
@@ -93,12 +88,12 @@
}
public void testGetAllStagingContainerListIds() throws Exception {
- List list = dao.getAllStagingContainerListIds(new Integer(1),new
Integer(0));
+ List list = dao.getAllStagingContainerListIds(new Integer(1));
checkResult(list);
}
public void testGetAllStagingTopLevelContainerListIds() throws Exception
{
- List list = dao.getAllStagingContainerListIds(new Integer(1),new
Integer(0));
+ List list = dao.getAllStagingContainerListIds(new Integer(1));
checkResult(list);
}
@@ -123,7 +118,7 @@
}
public void testGetNonDeletedStagingContainerListIds() throws Exception {
- List list = dao.getNonDeletedStagingContainerListIds(new
Integer(1),new Integer(0));
+ List list = dao.getNonDeletedStagingContainerListIds(new Integer(1));
checkResult(list);
}
