Author: tdraier
Date: Fri Jul 6 13:50:17 2007
New Revision: 17903
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17903&repname=
=3Djahia
Log:
removed unused code and data from pages (backport 17877)
Modified:
trunk/core/src/java/org/jahia/engines/shared/Page_Field.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java
trunk/core/src/java/org/jahia/services/pages/ContentPage.java
trunk/core/src/java/org/jahia/services/pages/JahiaPage.java
trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java
trunk/core/src/java/org/jahia/services/pages/JahiaPageInfo.java
Modified: trunk/core/src/java/org/jahia/engines/shared/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Page_Field.java&rev=3D17903&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
--- trunk/core/src/java/org/jahia/engines/shared/Page_Field.java (original)
+++ trunk/core/src/java/org/jahia/engines/shared/Page_Field.java Fri Jul 6=
13:50:17 2007
@@ -944,7 +944,7 @@
contentPage.getPageTemplateID(jParams),
contentPage.getRemoteURL(jParams.getEntryLoadReque=
st()),
contentPage.getPageLinkID(jParams.getEntryLoadRequ=
est()),
- contentPage.getCreator(),
+ null,
theField.getID());
if (contentPage.getPageType(jParams.getEntryLoadRequest())=
!=3D -1) {
pageBean.setOperation(DEFAULT_OPERATION[contentPage.ge=
tPageType(jParams.getEntryLoadRequest())]);
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaPagesManager.java&rev=3D17903&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaPagesManager.java =
Fri Jul 6 13:50:17 2007
@@ -191,9 +191,6 @@
}
JahiaSite site =3D siteDAO.findById(new Integer(newStagingInfo.get=
JahiaID()));
=
- data.setCounter(new Integer(newStagingInfo.getCounter()));
- data.setCreator(newStagingInfo.getCreator());
- data.setDoc(newStagingInfo.getDoc());
data.setJahiaAclId(new Integer(newStagingInfo.getAclID()));
data.setPageDefinition(definitionDAO.findByPK(new Integer(newStagi=
ngInfo.getPageTemplateID())));
data.setPageLinkId(new Integer(newStagingInfo.getPageLinkID()));
@@ -453,9 +450,6 @@
=
JahiaPagesData data =3D new JahiaPagesData();
data.setComp_id(pk);
- data.setCounter(new Integer(newStagingInfo.getCounter()));
- data.setCreator(newStagingInfo.getCreator());
- data.setDoc(newStagingInfo.getDoc());
data.setJahiaAclId(new Integer(newStagingInfo.getAclID()));
data.setPageDefinition(definitionDAO.findByPK(new Integer(newStagi=
ngInfo.getPageTemplateID())));
data.setPageLinkId(new Integer(newStagingInfo.getPageLinkID()));
@@ -514,8 +508,7 @@
data.getPageType().intValue(), da=
ta.getTitle(),
data.getPageDefinition().getId().=
intValue(),
data.getRemoteURL(), data.getPage=
LinkId().intValue(),
- data.getCreator(), data.getDoc(), data.getCounter().in=
tValue(),
- data.getJahiaAclId().intValue(),
+ data.getJahiaAclId().intValue(),
data.getComp_id().getVersionId().=
intValue(),
data.getComp_id().getWorkflowStat=
e().intValue(),
data.getComp_id().getLanguageCode=
(), this);
Modified: trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/model/JahiaPagesData.java&rev=3D17903&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
--- trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/hibernate/model/JahiaPagesData.java Fri J=
ul 6 13:50:17 2007
@@ -32,11 +32,6 @@
/**
* nullable persistent field
*/
- private Integer counter;
-
- /**
- * nullable persistent field
- */
private Integer pageLinkId;
=
/**
@@ -74,16 +69,6 @@
/**
* nullable persistent field
*/
- private String creator;
-
- /**
- * nullable persistent field
- */
- private String doc;
-
- /**
- * nullable persistent field
- */
private String remoteURL;
=
/**
@@ -113,42 +98,6 @@
}
=
/**
- * @hibernate.property column=3D"counter_jahia_pages_data"
- * length=3D"11"
- */
- public Integer getCounter() {
- return this.counter;
- }
-
- public void setCounter(Integer counter) {
- this.counter =3D counter;
- }
-
- /**
- * @hibernate.property column=3D"creator_jahia_pages_data"
- * length=3D"250"
- */
- public String getCreator() {
- return this.creator;
- }
-
- public void setCreator(String creator) {
- this.creator =3D creator;
- }
-
- /**
- * @hibernate.property column=3D"doc_jahia_pages_data"
- * length=3D"250"
- */
- public String getDoc() {
- return this.doc;
- }
-
- public void setDoc(String doc) {
- this.doc =3D doc;
- }
-
- /**
* @hibernate.property name=3D"jahiaAclId"
* column=3D"rights_jahia_pages_data"
*/
@@ -340,9 +289,6 @@
public Object clone() throws CloneNotSupportedException {
final JahiaPagesData data =3D new JahiaPagesData();
data.setComp_id((JahiaPagesDataPK) this.getComp_id().clone());
- data.setCounter(this.getCounter());
- data.setCreator(this.getCreator());
- data.setDoc(this.getDoc());
data.setJahiaAclId(this.getJahiaAclId());
data.setPageDefinition(this.getPageDefinition());
data.setPageLinkId(this.getPageLinkId());
Modified: trunk/core/src/java/org/jahia/services/pages/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/ContentPage.java&rev=3D17903&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
--- trunk/core/src/java/org/jahia/services/pages/ContentPage.java (original)
+++ trunk/core/src/java/org/jahia/services/pages/ContentPage.java Fri Jul =
6 13:50:17 2007
@@ -362,6 +362,10 @@
return aclID;
}
=
+ public void setAclID(int aclID) {
+ this.aclID =3D aclID;
+ }
+
/**
* Get the ACL id corresponding to the page workflow state. The ACL can
* change between workflow state due to a page move or a type change. =
In
@@ -418,56 +422,6 @@
=
//--------------------------------------------------------------------=
-----
=
- /**
- * Return the page's hit counter.
- *
- * @return Return the page counter.
- */
- public final int getCounter(EntryLoadRequest loadRequest) {
- int counter;
- try {
- counter =3D Integer.parseInt(getProperty("counter", loadReques=
t));
- } catch (Throwable t) {
- counter =3D -1;
- }
- return counter;
- }
-
- /**
- * @param jParams
- */
- public final int getCounter(ProcessingContext jParams) {
- if (jParams !=3D null) {
- return getCounter(jParams.getEntryLoadRequest());
- } else {
- logger.debug("FIXME : Method called with null ProcessingContex=
t, returning -1");
- return -1;
- }
- }
-
- //--------------------------------------------------------------------=
-----
-
- /**
- * Return the user nickname who created the page. This nickname is the
- * user name used internally by Jahia.
- *
- * @return Return the creator nickname.
- */
- public final String getCreator() {
- return getPageInfoVersion(null, false, true).getCreator();
- }
-
- //--------------------------------------------------------------------=
-----
-
- /**
- * Return the page's date of creation in ms from 1975.
- *
- * @return Return the date of creation.
- */
- public final String getDoc() {
- return getPageInfoVersion(null, false, true).getDoc();
- }
-
//--------------------------------------------------------------------=
-----
=
/**
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPage.java&rev=3D17903&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
--- trunk/core/src/java/org/jahia/services/pages/JahiaPage.java (original)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPage.java Fri Jul 6 =
13:50:17 2007
@@ -148,9 +148,6 @@
if (user =3D=3D null) {
return false;
}
-// String key =3D user.getUserKey()+permission;
-// if(checkAccesses.containsKey(key))
-// return ((Boolean)checkAccesses.get(key)).booleanValue();
// Test the access rights
boolean result =3D false;
try {
@@ -163,11 +160,10 @@
result =3D contentObject.checkAccess(user, permission,=
checkChilds);
}
}
-// checkAccesses.put(key,Boolean.valueOf(result));
} catch (JahiaACLException ex) {
- // if an error occured, just return false;
+ logger.debug("Problem getting ACL on page.", ex);
} catch (JahiaException e) {
- // if an error occured, just return false;
+ logger.debug("Problem getting ACL on page.", e);
}
=
return result;
@@ -336,9 +332,10 @@
* Return the page's hit counter.
*
* @return Return the page counter.
+ * @deprecated
*/
public final int getCounter () {
- return mContentPage.getCounter (mEntryLoadRequest);
+ return 0;
}
=
=
@@ -348,9 +345,10 @@
* user name used internally by Jahia.
*
* @return Return the creator nickname.
+ * @deprecated
*/
public final String getCreator () {
- return mContentPage.getCreator ();
+ return "";
}
=
=
@@ -359,9 +357,10 @@
* Return the page's date of creation in ms from 1975.
*
* @return Return the date of creation.
+ * @deprecated
*/
public final String getDoc () {
- return mContentPage.getDoc ();
+ return "";
}
=
=
@@ -968,15 +967,6 @@
output.append (" - Link ID [");
output.append (getPageLinkID ());
output.append ("]\n");
- output.append (" - Creator [");
- output.append (getCreator ());
- output.append ("]\n");
- output.append (" - Creation date [");
- output.append (getDoc ());
- output.append ("]\n");
- output.append (" - Counter [");
- output.append (getCounter ());
- output.append ("]\n");
output.append (" - ACL ID [");
output.append (getAclID ());
output.append ("]\n");
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPageBaseService.java&rev=3D17903&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java =
(original)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPageBaseService.java =
Fri Jul 6 13:50:17 2007
@@ -207,17 +207,17 @@
// Create a new ACL for the page/URL.
acl =3D new JahiaBaseACL();
if (acl !=3D null) {
- try {
- acl.create(parentAclID);
- } catch (ACLNotFoundException ex) {
- throw new JahiaException("Could not create page.",
- "The parent ACL ID [" +
- parentAclID +
- "] could not be found," +
- " while trying to create a new page.",
- JahiaException.PAGE_ERROR,
- JahiaException.ERROR_SEVE=
RITY);
- }
+ try {
+ acl.create(parentAclID);
+ } catch (ACLNotFoundException ex) {
+ throw new JahiaException("Could not create page.",
+ "The parent ACL ID [" +
+ parentAclID +
+ "] could not be found," +
+ " while trying to create a new page.",
+ JahiaException.PAGE_ERROR,
+ JahiaException.ERROR_SEVERITY);
+ }
} else {
throw new JahiaException("Could not create page.",
"Could not instanciate a new ACL object while =
trying to create a new page.",
@@ -300,8 +300,8 @@
}
=
JahiaPageInfo pageInfo =3D new JahiaPageInfo(pageID, siteID, p=
arentID,
- pageType, title, pageTemplateID, remoteURL, pageLinkID=
, creator,
- dateOfCreation, counter, acl.getID(), newVersionID,
+ pageType, title, pageTemplateID, remoteURL, pageLinkID,
+ acl.getID(), newVersionID,
newVersionStatus,
languageCode, pageManager);
//jParam.getLocale().toString());
@@ -330,17 +330,6 @@
page =3D
new JahiaPage(contentPage, pageTemplate, acl,
jParam.getEntryLoadRequest());
- acl =3D null;
- if (page =3D=3D null) {
- throw new JahiaException("Could not create page.",
- "Could not instanciate a new JahiaPage object.",
- JahiaException.PAGE_ERROR,
- JahiaException.CRITICAL_SEVERITY);
- }
-
- // add the page into the cache
-// mPageInfosCache.put(new Integer(pageID), pageInfoVector);
- pageInfo =3D null;
=
WorkflowEvent theEvent =3D new WorkflowEvent (this, contentPag=
e, jParam.getUser(), languageCode, false);
ServicesRegistry.getInstance ().getJahiaEventService ().fireOb=
jectChanged(theEvent);
@@ -1742,6 +1731,13 @@
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) {
@@ -1870,9 +1866,9 @@
private List lookupPageInfos(int pageID, EntryLoadRequest loadRequest)=
{
// Get the raw page infos
List pageInfoVector =3D pageManager.loadPageInfos(pageID, loadRequ=
est);
- if (pageInfoVector =3D=3D null) {
- pageInfoVector =3D new Vector();
- }
+ if (pageInfoVector =3D=3D null) {
+ pageInfoVector =3D new Vector();
+ }
=
return pageInfoVector;
}
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPageInfo.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPageInfo.java&rev=3D17903&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
--- trunk/core/src/java/org/jahia/services/pages/JahiaPageInfo.java (origin=
al)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPageInfo.java Fri Jul=
6 13:50:17 2007
@@ -50,9 +50,6 @@
private int mPageTemplateID; // page definition ID
private String mRemoteURL; // external URL (not a jahia intern=
al link)
private int mPageLinkID; // if the page is an internal link, ho=
ld the page ID
- private String mCreator; // creator's user name
- private String mDoc; // date of creation
- private int mCounter; // page access counter
private int mAclID; // access control list ID
=
private String mLanguageCode;
@@ -91,19 +88,16 @@
/**
* constructor
*/
- public JahiaPageInfo (int ID, int jahiaID, int parentID, int pageType,
- String title, int pageTemplateID, String remo=
teURL,
- int pageLinkID, String creator, String doc,
- int counter, int aclID,
- int versionID, int versionStatus, String lang=
uageCode,
- JahiaPagesManager pageManager) {
+ public JahiaPageInfo(int ID, int jahiaID, int parentID, int pageType,
+ String title, int pageTemplateID, String remoteUR=
L,
+ int pageLinkID,
+ int aclID,
+ int versionID, int versionStatus, String language=
Code,
+ JahiaPagesManager pageManager) {
mID =3D ID;
mSiteID =3D jahiaID;
mParentID =3D parentID;
mTitle =3D title;
- mCreator =3D creator;
- mDoc =3D doc;
- mCounter =3D counter;
mAclID =3D aclID;
mPageType =3D pageType;
mPageTemplateID =3D pageTemplateID;
@@ -217,37 +211,6 @@
=
//--------------------------------------------------------------------=
-----
/**
- * Return the user nickname who created the page. This nickname is the
- * user name used internally by Jahia.
- *
- * @return Return the creator nickname.
- */
- public String getCreator () {
- return mCreator;
- }
-
- //--------------------------------------------------------------------=
-----
- /**
- * Return the page's date of creation in ms from 1975.
- *
- * @return Return the date of creation.
- */
- public String getDoc () {
- return mDoc;
- }
-
- //--------------------------------------------------------------------=
-----
- /**
- * Return the page's hit counter.
- *
- * @return Return the page counter.
- */
- public int getCounter () {
- return mCounter;
- }
-
- //--------------------------------------------------------------------=
-----
- /**
* Return the ACL unique identification number.
*
* @return Return the ACL ID.
@@ -452,15 +415,6 @@
=
//--------------------------------------------------------------------=
-----
/**
- * Increment by one unit the page hit counter.
- */
- public synchronized void incrementCounter () {
- mCounter++;
- mDataChanged =3D true;
- }
-
- //--------------------------------------------------------------------=
-----
- /**
* clone page info
*
* @param aclID int The id to asociate to the cloned page
@@ -479,8 +433,8 @@
// String Title =3D "clonedTitle";
return new JahiaPageInfo (pageID, mSiteID, newParentID, mPageType,
mTitle, mPageTemplateID, mRemoteURL,
- mPageLinkID, mCreator, dateOfCreation,
- mCounter, aclID,
+ mPageLinkID,
+ aclID,
mVersionID, mVersionStatus, mLanguageCode, pageManager);
}
=
@@ -488,8 +442,8 @@
String languageCode) {
return new JahiaPageInfo (mID, mSiteID, mParentID, mPageType,
mTitle, mPageTemplateID, mRemoteURL,
- mPageLinkID, mCreator, mDoc,
- mCounter, mAclID, versionID, versionStatus,
+ mPageLinkID,
+ mAclID, versionID, versionStatus,
languageCode, pageManager);
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
