Author: tdraier
Date: Fri Jun 15 12:18:40 2007
New Revision: 17573
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17573&repname=
=3Djahia
Log:
simplified and optimized jahia_links, update schema
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentDef=
inition.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CrossRefer=
enceManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ObjectLink=
.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaLinkManager.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaLink.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/layout/PortletsEve=
ntListener.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/categorie=
s/CategoryServiceImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPageBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
hypersonic/jahia-schema.sql
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mssql/jahia-schema.sql
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql-tx/jahia-schema.sql
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql/jahia-schema.sql
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
oracle/jahia-schema.sql
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
postgresql/jahia-schema.sql
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entDefinition.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentDefinition.java&rev=3D17573&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentDef=
inition.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentDef=
inition.java Fri Jun 15 12:18:40 2007
@@ -367,14 +367,7 @@
ObjectLink objectLink =3D ObjectLink.createLink (metadataDefiniti=
on.getObjectKey(),
obj.getObjectKey(),
StructuralRelationship.ME=
TADATADEFINITION_LINK,
- 1,
- now,
- userKey,
- now,
- userKey,
- new HashMap (),
- new HashMap (),
- new HashMap ());
+ new HashMap ());
}
=
public String[] getAliasName(){
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cont=
entObject.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ContentObject.java&rev=3D17573&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ContentObj=
ect.java Fri Jun 15 12:18:40 2007
@@ -21,7 +21,6 @@
import org.jahia.content.events.ContentActivationEvent;
import org.jahia.data.fields.JahiaField;
import org.jahia.data.fields.LoadFlags;
-import org.jahia.data.fields.JahiaDateFieldUtil;
import org.jahia.engines.EngineMessage;
import org.jahia.exceptions.JahiaException;
import org.jahia.hibernate.manager.*;
@@ -44,7 +43,6 @@
import org.apache.commons.lang.StringUtils;
=
import java.util.*;
-import java.text.SimpleDateFormat;
import java.text.DateFormat;
=
/**
@@ -1713,7 +1711,7 @@
if (this.getClass() =3D=3D object.getClass()) {
Date now =3D new Date();
try {
- ObjectLink.createLink(this.getObjectKey(), object.getObjec=
tKey(), type,1,now,jParams.getUser().getUserKey(), now, jParams.getUser().g=
etUserKey(), new HashMap(), new HashMap(), new HashMap());
+ ObjectLink.createLink(this.getObjectKey(), object.getObjec=
tKey(), type, new HashMap());
object.resetPicked();
} catch (Throwable e) {
logger.debug(e);
@@ -1766,6 +1764,7 @@
}
=
public ContentObject getPickedObject(String type) throws JahiaExceptio=
n {
+
if(pickedObjectType=3D=3Dnull) {
List links =3D linkManager.findByTypeAndRightObjectKey(type,th=
is.getObjectKey());
for ( int i=3D0 ; i<links.size(); i++ ){
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Cros=
sReferenceManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/CrossReferenceManager.java&rev=3D17=
573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CrossRefer=
enceManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/CrossRefer=
enceManager.java Fri Jun 15 12:18:40 2007
@@ -170,10 +170,8 @@
}
=
if (!curXRefSet.contains (objectXRef)) {
- ObjectLink.createLink (objectXRef, objectKey, REFERENCE_TYPE, =
1,
- new Date (),
- "root:0", new Date (), "root:0", new HashMap (),
- new HashMap (), new HashMap ());
+ ObjectLink.createLink (objectXRef, objectKey, REFERENCE_TYPE,
+ new HashMap ());
curXRefSet.add (objectXRef);
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Obje=
ctLink.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/ObjectLink.java&rev=3D17573&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ObjectLink=
.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/ObjectLink=
.java Fri Jun 15 12:18:40 2007
@@ -22,7 +22,6 @@
import org.jahia.hibernate.manager.JahiaLinkManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
=
-import java.util.ArrayList;
import java.util.List;
import java.io.Serializable;
=
@@ -53,47 +52,25 @@
private java.util.Map rightObjectMetadata;
private java.util.Map commonMetadata;
=
- public ObjectLink (int ID, ObjectKey leftObjectKey,
- ObjectKey rightObjectKey,
- String type, int status, java.util.Date creation=
Date,
- String creationUserKey,
- java.util.Date lastModificationDate,
- String lastModificationUserKey,
- Map leftObjectMetadata,
- Map rightObjectMetadata, Map commonMetadata) {
+ public ObjectLink(int ID, ObjectKey leftObjectKey,
+ ObjectKey rightObjectKey,
+ String type,
+ Map commonMetadata) {
this.ID =3D ID;
this.leftObjectKey =3D leftObjectKey;
this.rightObjectKey =3D rightObjectKey;
this.type =3D type;
- this.status =3D status;
- this.creationDate =3D creationDate;
- this.creationUserKey =3D creationUserKey;
- this.lastModificationDate =3D lastModificationDate;
- this.lastModificationUserKey =3D lastModificationUserKey;
- this.leftObjectMetadata =3D leftObjectMetadata;
- this.rightObjectMetadata =3D rightObjectMetadata;
this.commonMetadata =3D commonMetadata;
}
=
- static public ObjectLink createLink (ObjectKey leftObjectKey,
- ObjectKey rightObjectKey,
- String type, int status,
- java.util.Date creationDate,
- String creationUserKey,
- java.util.Date lastModificationDa=
te,
- String lastModificationUserKey,
- Map leftObjectMetadata,
- Map rightObjectMetadata,
- Map commonMetadata)
+ static public ObjectLink createLink(ObjectKey leftObjectKey,
+ ObjectKey rightObjectKey,
+ String type,
+ Map commonMetadata)
throws JahiaException {
ObjectLink link =3D new ObjectLink( -1, leftObjectKey, rightObject=
Key,
- type, status, creationDate,
- creationUserKey,
- lastModificationDate,
- lastModificationUserKey,
- leftObjectMetadata,
- rightObjectMetadata,
- commonMetadata);
+ type,
+ commonMetadata);
JahiaLinkManager linkManager =3D (JahiaLinkManager) SpringContextS=
ingleton.getInstance().getContext().getBean(JahiaLinkManager.class.getName(=
));
linkManager.createObjectLink(link);
return link;
@@ -198,66 +175,6 @@
this.type =3D type;
}
=
- public int getStatus () {
- return status;
- }
-
- public void setStatus (int status) {
- this.status =3D status;
- }
-
- public java.util.Date getCreationDate () {
- return creationDate;
- }
-
- public void setCreationDate (java.util.Date creationDate) {
- this.creationDate =3D creationDate;
- }
-
- public String getCreationUserKey () {
- return creationUserKey;
- }
-
- public void setCreationUserKey (String creationUserKey) {
- this.creationUserKey =3D creationUserKey;
- }
-
- public java.util.Date getLastModificationDate () {
- return lastModificationDate;
- }
-
- public void setLastModificationDate (java.util.Date lastModificationDa=
te) {
- this.lastModificationDate =3D lastModificationDate;
- }
-
- public String getLastModificationUserKey () {
- return lastModificationUserKey;
- }
-
- public void setLastModificationUserKey (String lastModificationUserKey=
) {
- this.lastModificationUserKey =3D lastModificationUserKey;
- }
-
- public java.util.Map getLeftObjectMetadata () {
- return leftObjectMetadata;
- }
-
- public void setLeftObjectMetadata (Map leftObjectMetadata) {
- if ( leftObjectMetadata !=3D null ){
- this.leftObjectMetadata =3D leftObjectMetadata;
- }
- }
-
- public java.util.Map getRightObjectMetadata () {
- return rightObjectMetadata;
- }
-
- public void setRightObjectMetadata (Map rightObjectMetadata) {
- if ( rightObjectMetadata !=3D null ){
- this.rightObjectMetadata =3D rightObjectMetadata;
- }
- }
-
public java.util.Map getCommonMetadata () {
return commonMetadata;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/BigText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/BigText_Field.java&rev=3D175=
73&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java Fri Jun 15 12:18:40 2007
@@ -436,10 +436,8 @@
final Integer curPageIDInt =3D (Integer) pageXRefIter.next=
();
logger.debug("Found reference to page " + curPageIDInt + "=
in this bigtext");
ObjectLink.createLink(fieldKey,
- new ContentPageKey(curPageIDInt.intValue()), "hard=
codedLink", 1,
- new Date(),
- "root:0", new Date(), "root:0", new HashMap(),
- new HashMap(), new HashMap());
+ new ContentPageKey(curPageIDInt.intValue()), "hard=
codedLink",
+ new HashMap());
}
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/ma=
nager/JahiaLinkManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/manager/JahiaLinkManager.java&rev=
=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaLinkManager.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/manager/=
JahiaLinkManager.java Fri Jun 15 12:18:40 2007
@@ -401,13 +401,8 @@
=
private JahiaLink fillJahiaLink(ObjectLink link) {
JahiaLink jahiaLink =3D new JahiaLink();
- jahiaLink.setCreationDate(link.getCreationDate());
- jahiaLink.setCreationUser(link.getCreationUserKey());
- jahiaLink.setLastmodifDate(link.getLastModificationDate());
- jahiaLink.setLastmodifUser(link.getLastModificationUserKey());
jahiaLink.setLeftOid(link.getLeftObjectKey().toString());
jahiaLink.setRightOid(link.getRightObjectKey().toString());
- jahiaLink.setStatus(new Integer(link.getStatus()));
jahiaLink.setType(link.getType());
return jahiaLink;
}
@@ -418,11 +413,8 @@
objectLink =3D new ObjectLink(jahiaLink.getId().intValue(),
ObjectKey.getInstance(jahiaLink.ge=
tLeftOid()),
ObjectKey.getInstance(jahiaLink.ge=
tRightOid()),
- jahiaLink.getType(), jahiaLink.get=
Status().intValue(),
- jahiaLink.getCreationDate(), jahia=
Link.getCreationUser(),
- jahiaLink.getLastmodifDate(), jahi=
aLink.getLastmodifUser(),
- new HashMap(2), new HashMap(2),
- new HashMap(2));
+ jahiaLink.getType(),
+ new HashMap(2));
} catch (ClassNotFoundException e) {
log.error("Class Not found when converting ObjectLink", e);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/mo=
del/JahiaLink.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/hibernate/model/JahiaLink.java&rev=3D17573&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaLink.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/hibernate/model/Ja=
hiaLink.java Fri Jun 15 12:18:40 2007
@@ -153,66 +153,6 @@
this.type =3D type;
}
=
- /**
- * @hibernate.property column=3D"status"
- * length=3D"11"
- */
- public Integer getStatus() {
- return this.status;
- }
-
- public void setStatus(Integer status) {
- this.status =3D status;
- }
-
- /**
- * @hibernate.property column=3D"creation_date"
- * length=3D"14"
- */
- public Date getCreationDate() {
- return this.creationDate;
- }
-
- public void setCreationDate(Date creationDate) {
- this.creationDate =3D creationDate;
- }
-
- /**
- * @hibernate.property column=3D"creation_user"
- * length=3D"255"
- */
- public String getCreationUser() {
- return this.creationUser;
- }
-
- public void setCreationUser(String creationUser) {
- this.creationUser =3D creationUser;
- }
-
- /**
- * @hibernate.property column=3D"lastmodif_date"
- * length=3D"14"
- */
- public Date getLastmodifDate() {
- return this.lastmodifDate;
- }
-
- public void setLastmodifDate(Date lastmodifDate) {
- this.lastmodifDate =3D lastmodifDate;
- }
-
- /**
- * @hibernate.property column=3D"lastmodif_user"
- * length=3D"255"
- */
- public String getLastmodifUser() {
- return this.lastmodifUser;
- }
-
- public void setLastmodifUser(String lastmodifUser) {
- this.lastmodifUser =3D lastmodifUser;
- }
-
public String toString() {
return new ToStringBuilder(this)
.append("id", getId())
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/layout/Portl=
etsEventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/layout/PortletsEventListener.java&rev=3D175=
73&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/layout/PortletsEve=
ntListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/layout/PortletsEve=
ntListener.java Fri Jun 15 12:18:40 2007
@@ -81,7 +81,7 @@
PSPM.setPortletSet(portletSpanningGrid, portletGroupName, =
je.getProcessingContext(), je.getJahiaData());
Date date =3D new Date();
ObjectLink.createLink(new ContentContainerKey(portlet.getC=
ontainerID()),new ContentContainerKey(portlet.getPortletSourceID()),"layout=
_metadata",
- 1, date,theUser.getUserKey(), date, theUser.getUse=
rKey(), new HashMap(), new HashMap(), new HashMap());
+ new HashMap());
} catch (JahiaException e) {
JahiaConsole.printe("LayoutEventListener.containerAdded", =
e);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cat=
egories/CategoryServiceImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/categories/CategoryServiceImpl.jav=
a&rev=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/categorie=
s/CategoryServiceImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/categorie=
s/CategoryServiceImpl.java Fri Jun 15 12:18:40 2007
@@ -228,8 +228,8 @@
}
=
Date currentDate =3D new Date ();
- ObjectLink.createLink(parentCategory.getObjectKey(), childKey, CAT=
EGORY_LINKTYPE, 1, currentDate, "root:0",
- currentDate, "root:0", new HashMap(), new Ha=
shMap(), new HashMap());
+ ObjectLink.createLink(parentCategory.getObjectKey(), childKey, CAT=
EGORY_LINKTYPE,
+ new HashMap());
lastModifCache.flush();
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportHandler.java&re=
v=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java Fri Jun 15 12:18:40 2007
@@ -317,8 +317,8 @@
if (leftKey !=3D null) {
List l =3D ObjectLink.findByTypeAndLeftAndRightObjectK=
eys(type, leftKey, rightKey);
if (l.isEmpty()) {
- ObjectLink.createLink(leftKey, rightKey, type, 1, =
new Date(), jParams.getUser().toString(),
- new Date(), jParams.getUser().toString(), =
new HashMap(), new HashMap(), new HashMap());
+ ObjectLink.createLink(leftKey, rightKey, type,
+ new HashMap());
}
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/JahiaPageBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java&re=
v=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPageBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Jah=
iaPageBaseService.java Fri Jun 15 12:18:40 2007
@@ -1732,13 +1732,6 @@
EntryLoadRequest.CURRENT);
List archivePageInfoVector =3D lookupPageInfos(pageID,
EntryLoadRequest.VERSIONED);
- if (archivePageInfoVector =3D=3D null) {
- archivePageInfoVector =3D new Vector();
- }
-
- if (activePageInfoVector =3D=3D null) {
- throw new JahiaPageNotFoundException(pageID);
- }
=
if (activePageInfoVector.size() =3D=3D 0
&& archivePageInfoVector.size() =3D=3D 0) {
@@ -1866,13 +1859,10 @@
// Return null if the page info doesn't exist.
private List lookupPageInfos(int pageID, EntryLoadRequest loadRequest)=
{
// Get the raw page infos
- List pageInfoVector =3D null;
- // the page doesn't exist yet in the cache, load it from the
- // database.
- pageInfoVector =3D pageManager.loadPageInfos(pageID, loadReque=
st);
- if (pageInfoVector =3D=3D null) {
- pageInfoVector =3D new Vector();
- }
+ List pageInfoVector =3D pageManager.loadPageInfos(pageID, loadRequ=
est);
+ if (pageInfoVector =3D=3D null) {
+ pageInfoVector =3D new Vector();
+ }
=
return pageInfoVector;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/hypersonic/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.s=
ql&rev=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
hypersonic/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
hypersonic/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -569,11 +569,6 @@
left_oid VARCHAR (100),
right_oid VARCHAR (100),
type VARCHAR (100),
- status integer,
- creation_date timestamp,
- creation_user VARCHAR (255),
- lastmodif_date timestamp,
- lastmodif_user VARCHAR (255),
PRIMARY KEY(id)
);
=
@@ -1200,6 +1195,7 @@
MODEVALUE integer,
EXTERNALNAME VARCHAR (255),
EXTERNALPROCESS VARCHAR (255),
+ MAINOBJECTKEY VARCHAR (255),
PRIMARY KEY(OBJECTKEY)
);
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/mssql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql&re=
v=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mssql/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mssql/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -493,11 +493,6 @@
left_oid NVARCHAR(100) null,
right_oid NVARCHAR(100) null,
type NVARCHAR(100) null,
- status int null,
- creation_date datetime null,
- creation_user NVARCHAR(255) null,
- lastmodif_date datetime null,
- lastmodif_user NVARCHAR(255) null,
primary key (id)
);
create table jahia_link_metadata (
@@ -882,6 +877,7 @@
MODEVALUE int null,
EXTERNALNAME NVARCHAR(255) null,
EXTERNALPROCESS NVARCHAR(255) null,
+ MAINOBJECTKEY NVARCHAR (255),
primary key (OBJECTKEY)
);
alter table CLIPPER
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/mysql-tx/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql-tx/jahia-schema.sql=
&rev=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql-tx/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql-tx/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -608,11 +608,6 @@
left_oid VARCHAR (255),
right_oid VARCHAR (255),
type VARCHAR (255),
- status INTEGER,
- creation_date TIMESTAMP,
- creation_user VARCHAR (255),
- lastmodif_date TIMESTAMP,
- lastmodif_user VARCHAR (255),
PRIMARY KEY(id),
INDEX jahia_link_index (right_oid)
);
@@ -1287,6 +1282,7 @@
MODEVALUE INTEGER,
EXTERNALNAME VARCHAR (255),
EXTERNALPROCESS VARCHAR (255),
+ MAINOBJECTKEY VARCHAR (255),
PRIMARY KEY(OBJECTKEY));
=
ALTER TABLE jahia_workflow TYPE=3DInnoDB; =
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/mysql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql&re=
v=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
mysql/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -551,11 +551,6 @@
left_oid VARCHAR (100),
right_oid VARCHAR (100),
type VARCHAR (100),
- status INTEGER,
- creation_date TIMESTAMP,
- creation_user VARCHAR (255),
- lastmodif_date TIMESTAMP,
- lastmodif_user VARCHAR (255),
PRIMARY KEY(id),
INDEX jahia_link_index (right_oid)
);
@@ -1180,6 +1175,7 @@
MODEVALUE INTEGER,
EXTERNALNAME VARCHAR (255),
EXTERNALPROCESS VARCHAR (255),
+ MAINOBJECTKEY VARCHAR (255),
PRIMARY KEY(OBJECTKEY));
=
# -----------------------------------------------------------------------
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/oracle/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql&r=
ev=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
oracle/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
oracle/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -425,11 +425,6 @@
left_oid varchar2(100),
right_oid varchar2(100),
type varchar2(100),
- status number(10,0),
- creation_date timestamp,
- creation_user varchar2(255),
- lastmodif_date timestamp,
- lastmodif_user varchar2(255),
primary key (id)
);
create table jahia_link_metadata (
@@ -805,6 +800,7 @@
MODEVALUE number(10,0),
EXTERNALNAME varchar2(255),
EXTERNALPROCESS varchar2(255),
+ MAINOBJECTKEY varchar2(255),
primary key (OBJECTKEY)
);
alter table CLIPPER =
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/s=
chema/postgresql/jahia-schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.s=
ql&rev=3D17573&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
postgresql/jahia-schema.sql (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/var/db/sql/schema/=
postgresql/jahia-schema.sql Fri Jun 15 12:18:40 2007
@@ -620,11 +620,6 @@
left_oid varchar (100),
right_oid varchar (100),
type varchar (100),
- status integer,
- creation_date timestamp,
- creation_user varchar (255),
- lastmodif_date timestamp,
- lastmodif_user varchar (255),
PRIMARY KEY (id)
);
=
@@ -1301,6 +1296,7 @@
MODEVALUE integer,
EXTERNALNAME varchar (255),
EXTERNALPROCESS varchar (255),
+ MAINOBJECTKEY varchar (255),
PRIMARY KEY (OBJECTKEY)
);
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
