Author: tdraier
Date: Mon Sep 24 17:44:19 2007
New Revision: 18636
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18636&repname=
=3Djahia
Log:
sone fixes for blog api in multisite (QA-21), try to connect to correct sit=
e before getting the user
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Abst=
ractAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/AddT=
rackBackPingAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Dele=
tePostAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Edit=
PostAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetC=
ategoriesAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetR=
ecentPostTitlesAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetR=
ecentPostsAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetT=
rackBackPingsAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetU=
serBlogsAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/NewM=
ediaObjectAction.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/NewP=
ostAction.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/AbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/AbstractAction.java&rev=3D186=
36&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/blogs/actions/Abst=
ractAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Abst=
ractAction.java Mon Sep 24 17:44:19 2007
@@ -210,7 +210,7 @@
}
return postContainer;
}
- =
+
/**
* Loads a specific container without any field structure check. Basic=
ally
* used to read the content of a container without making changes to i=
t.
@@ -308,7 +308,9 @@
JahiaException.ENTRY_NOT_FOUND,
JahiaException.WARNING_SEVERITY);
}
- =
+ jParams.setSite(blogContentPage.getSite());
+ jParams.setSiteID(blogContentPage.getSite().getID());
+ jParams.setSiteKey(blogContentPage.getSite().getSiteKey());
jParams.changePage(blogContentPage);
return blogContentPage;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/AddTrackBackPingAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/AddTrackBackPingAction.java&r=
ev=3D18636&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/blogs/actions/AddT=
rackBackPingAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/AddT=
rackBackPingAction.java Mon Sep 24 17:44:19 2007
@@ -142,7 +142,7 @@
=
JahiaFieldDefinition tbUrlFieldDefinition =3D
trackBacks.getDefinition()
.findFieldInStructure(
-
containerNames.getValue(containerNames.TB_URL),
+
containerNames.getValue(BlogDefinitionNames.TB_URL),
pageDefID);
ContentSmallTextSharedLangField.createSmallText(siteId, pageId,
pingContainer.getID(),
tbUrlFieldDefinition.getID(),
@@ -150,7 +150,7 @@
=
JahiaFieldDefinition tbPingIPFieldDefinition =3D trackBacks
.getDefinition().findFieldInStructure(
-
containerNames.getValue(containerNames.TB_PING_IP),
+
containerNames.getValue(BlogDefinitionNames.TB_PING_IP),
pageDefID);
ContentSmallTextSharedLangField.createSmallText(siteId, pageId,
pingContainer.getID(),
tbPingIPFieldDefinition.getID(),
@@ -160,7 +160,7 @@
if (title !=3D null && title.length() > 0) {
JahiaFieldDefinition tbTitleFieldDefinition =3D
trackBacks
.getDefinition().findFieldInStructure(
-
containerNames.getValue(containerNames.TB_TITLE),
+
containerNames.getValue(BlogDefinitionNames.TB_TITLE),
pageDefID);
ContentSmallTextSharedLangField.createSmallText(siteId,
pageId,
pingContainer.getID(),
tbTitleFieldDefinition.getID(),
@@ -170,7 +170,7 @@
if (excerpt !=3D null && excerpt.length() > 0) {
JahiaFieldDefinition tbExcerptFieldDefinition =3D
trackBacks
.getDefinition().findFieldInStructure(
-
containerNames.getValue(containerNames.TB_EXCERPT),
+
containerNames.getValue(BlogDefinitionNames.TB_EXCERPT),
pageDefID);
ContentBigTextField.createBigText(siteId, pageId,
pingContainer
.getID(),
tbExcerptFieldDefinition.getID(), pingContainer
@@ -181,7 +181,7 @@
JahiaFieldDefinition tbBlogNameFieldDefinition =3D
trackBacks
.getDefinition().findFieldInStructure(
containerNames
-
.getValue(containerNames.TB_BLOG_NAME),
+
.getValue(BlogDefinitionNames.TB_BLOG_NAME),
pageDefID);
ContentSmallTextSharedLangField.createSmallText(siteId,
pageId,
pingContainer.getID(),
tbBlogNameFieldDefinition.getID(),
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/DeletePostAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/DeletePostAction.java&rev=3D1=
8636&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/blogs/actions/Dele=
tePostAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Dele=
tePostAction.java Mon Sep 24 17:44:19 2007
@@ -93,20 +93,15 @@
// Create commmon resources
super.init();
=
- // First check that the user is registered to this site.
- final JahiaUser user =3D super.checkLogin();
- =
// Load the Container and check the structure
final JahiaContainer postContainer =3D super.getContainer(
Integer.parseInt(postID), "en");
=
- if (postContainer =3D=3D null) {
- throw new JahiaException("Post: "+postID+
- " does not exist", "Container: "+postID+ " does not ex=
ist",
- JahiaException.ENTRY_NOT_FOUND,
- JahiaException.WARNING_SEVERITY);
- }
- =
+ super.changePage(postContainer.getPageID());
+
+ // First check that the user is registered to this site.
+ final JahiaUser user =3D super.checkLogin();
+
if (!postContainer.checkWriteAccess(user)) {
throw new JahiaException(
"You do not have write access to Post: "+postID,
@@ -132,13 +127,12 @@
user, ContentObject.SHARED_LANGUAGE, stateModifContext);
=
if (publish) {
- super.changePage(postContainer.getPageID());
super.activateContainer(postContainer.getID(), user);
}
=
super.flushPageCacheThatDisplayContainer(postContainer);
=
log.debug("Post: "+postContainer.getID()+ " deleted");
- return new Boolean(true);
+ return Boolean.TRUE;
}
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/EditPostAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/EditPostAction.java&rev=3D186=
36&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/blogs/actions/Edit=
PostAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/Edit=
PostAction.java Mon Sep 24 17:44:19 2007
@@ -106,12 +106,14 @@
// Create commmon resources
super.init();
=
- // First check that the user is registered to this site.
- JahiaUser user =3D super.checkLogin();
- =
// Load the Container and check the structure
final JahiaContainer postContainer =3D super.getContainer(Integer.
parseInt(postID));
+
+ super.changePage(postContainer.getPageID());
+
+ // First check that the user is registered to this site.
+ JahiaUser user =3D super.checkLogin();
=
if (!postContainer.checkWriteAccess(user)) {
throw new JahiaException(
@@ -123,11 +125,9 @@
=
log.debug("Working on Container: "+postContainer.getID());
=
- super.changePage(postContainer.getPageID());
- =
/* Set all the fields' value with the right data */
// set title field
- String fieldName =3D super.containerNames.getValue(containerNames.=
POST_TITLE);
+ String fieldName =3D super.containerNames.getValue(BlogDefinitionN=
ames.POST_TITLE);
String fieldValue =3D "";
=
// If content !=3D null -> we are using the Blogger API
@@ -158,19 +158,19 @@
field.setValue(fieldValue);
=
// set body field
- fieldName =3D super.containerNames.getValue(containerNames.POST_BO=
DY);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_BODY);
field =3D postContainer.getField(fieldName);
log.debug("Setting value of field: "+field.getID() +"; "+
field.getLanguageCode());
super.setValue(field, content);
=
// set posting date
- fieldName =3D super.containerNames.getValue(containerNames.POST_DA=
TE);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_DATE);
field =3D postContainer.getField(fieldName);
field.setObject(Long.toString(System.currentTimeMillis()));
=
// set the author of the message
- fieldName =3D super.containerNames.getValue(containerNames.POST_AU=
THOR);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_AUTHOR);
field =3D postContainer.getField(fieldName);
log.debug("Setting value of field: "+field.getID() +"; "+
field.getLanguageCode());
@@ -182,7 +182,7 @@
// check if extra Movable Type are present in the struct
if (struct !=3D null) {
=
- fieldName =3D containerNames.getValue(containerNames.POST_EXCE=
RPT);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.POST=
_EXCERPT);
field =3D postContainer.getField(fieldName);
if (struct.containsKey(MetaPostInfo.MT_EXCERPT)) {
String excerpt =3D (String)struct.get(MetaPostInfo.MT_EXCE=
RPT);
@@ -192,7 +192,7 @@
}
}
=
- fieldName =3D containerNames.getValue(containerNames.POST_KEYW=
ORDS);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.POST=
_KEYWORDS);
field =3D postContainer.getField(fieldName);
if (struct.containsKey(MetaPostInfo.MT_KEYWORDS)) {
String keywords =3D (String)struct.get(MetaPostInfo.MT_KEY=
WORDS);
@@ -212,10 +212,10 @@
=
JahiaContainerDefinition def =3D JahiaContainerDefinitions=
Registry.
getInstance().getDefinition(jParams.getSiteID(),
- containerNames.getValue(containerNames.BLOG_TB_PIN=
G_LIST));
+ containerNames.getValue(BlogDefinitionNames.BLOG_T=
B_PING_LIST));
=
JahiaContainerList pingURLs =3D postContainer.getContainer=
List(
- containerNames.getValue(containerNames.BLOG_TB_PIN=
G_LIST));
+ containerNames.getValue(BlogDefinitionNames.BLOG_T=
B_PING_LIST));
=
int listID =3D 0, aclID =3D 0;
if (pingURLs !=3D null && pingURLs.getID() > 0) {
@@ -268,7 +268,7 @@
log.debug("on list: "+listID);
=
field =3D pingURLContainer.getField(containerNames.
- getValue(containerNames.TB_PING_URL));
+ getValue(BlogDefinitionNames.TB_PING_URL));
field.setValue(url);
=
containerService.saveContainer(pingURLContainer,
@@ -301,7 +301,7 @@
if (publish) {
if (publishPingContainers) {
JahiaContainerList pingURLs =3D postContainer.getContainer=
List(
- containerNames.getValue(containerNames.BLOG_TB_PIN=
G_LIST));
+ containerNames.getValue(BlogDefinitionNames.BLOG_T=
B_PING_LIST));
if (pingURLs !=3D null && pingURLs.getID() > 0) {
activatePingContainers(pingURLs, user);
}
@@ -313,7 +313,7 @@
super.flushPageCacheThatDisplayContainer(postContainer);
=
log.debug("Post: "+postContainer.getID()+ " edited");
- return new Boolean(true);
+ return Boolean.TRUE;
}
=
/**
@@ -329,8 +329,7 @@
=
while (en.hasMoreElements()) {
JahiaContainer c =3D (JahiaContainer)en.nextElement();
- JahiaField f =3D c.getField(containerNames.getValue(containerN=
ames.
- TB_PING_URL));
+ JahiaField f =3D c.getField(containerNames.getValue(BlogDefini=
tionNames.TB_PING_URL));
=
result.addElement(f.getValue());
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/GetCategoriesAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/GetCategoriesAction.java&rev=
=3D18636&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/blogs/actions/GetC=
ategoriesAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetC=
ategoriesAction.java Mon Sep 24 17:44:19 2007
@@ -66,11 +66,12 @@
// Create commmon resources
super.init();
=
+ ContentPage blogContentPage =3D super.changePage(Integer.parseInt(=
blogID));
+
// First check that the user is registered to this site.
super.checkLogin();
=
- ContentPage page =3D super.changePage(Integer.parseInt(blogID));
- JahiaPage blogPage =3D page.getPage(jParams);
+ JahiaPage blogPage =3D blogContentPage.getPage(jParams);
=
Category rootCategory =3D Category.getRootCategory(jParams.getUser=
());
ArrayList categories =3D buildCategoryTree(new ArrayList(),
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/GetRecentPostTitlesAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/GetRecentPostTitlesAction.jav=
a&rev=3D18636&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/blogs/actions/GetR=
ecentPostTitlesAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetR=
ecentPostTitlesAction.java Mon Sep 24 17:44:19 2007
@@ -69,16 +69,16 @@
public Object execute() throws JahiaException {
// Create commmon resources
super.init();
- =
- // First check that the user is registered to this site.
- super.checkLogin();
- =
+
// Set the correct page
super.changePage(Integer.parseInt(blogID));
=
+ // First check that the user is registered to this site.
+ super.checkLogin();
+
// Name of the containerList containing all the posts of the blog
final String containerListName =3D super.containerNames.getValue(
- containerNames.BLOG_POSTS_LIST_NAME);
+ BlogDefinitionNames.BLOG_POSTS_LIST_NAME);
final int containerListID =3D containerService.getContainerListID(
containerListName, Integer.parseInt(blogID));
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/GetRecentPostsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/GetRecentPostsAction.java&rev=
=3D18636&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/blogs/actions/GetR=
ecentPostsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetR=
ecentPostsAction.java Mon Sep 24 17:44:19 2007
@@ -87,15 +87,15 @@
// Create commmon resources
super.init();
=
- // First check that the user is registered to this site.
- super.checkLogin();
- =
// Set the correct page
super.changePage(Integer.parseInt(blogID));
- =
+
+ // First check that the user is registered to this site.
+ super.checkLogin();
+
// Name of the containerList containing all the posts of the blog
final String containerListName =3D super.containerNames.getValue(
- containerNames.BLOG_POSTS_LIST_NAME);
+ BlogDefinitionNames.BLOG_POSTS_LIST_NAME);
final int containerListID =3D containerService.getContainerListID(
containerListName, Integer.parseInt(blogID));
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/GetTrackBackPingsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/GetTrackBackPingsAction.java&=
rev=3D18636&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/blogs/actions/GetT=
rackBackPingsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetT=
rackBackPingsAction.java Mon Sep 24 17:44:19 2007
@@ -83,7 +83,7 @@
super.changePage(postContainer.getPageID());
=
JahiaContainerList trackBacks =3D postContainer.getContainerList(
- super.containerNames.getValue(containerNames.BLOG_TB_LIST)=
); =
+ super.containerNames.getValue(BlogDefinitionNames.BLOG_TB_=
LIST));
=
if (trackBacks =3D=3D null || trackBacks.getID() < 1) {
log.debug("No Trackbacks found");
@@ -101,15 +101,15 @@
=
log.debug("Working on Container: "+tbContainer.getID());
=
- String fieldName =3D containerNames.getValue(containerNames.TB=
_BLOG_NAME);
+ String fieldName =3D containerNames.getValue(BlogDefinitionNam=
es.TB_BLOG_NAME);
JahiaField field =3D tbContainer.getField(fieldName); =
if (field !=3D null) tb.put(MetaPostInfo.PING_TITLE, field.get=
Value());
=
- fieldName =3D containerNames.getValue(containerNames.TB_URL);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_U=
RL);
field =3D tbContainer.getField(fieldName);
if (field !=3D null) tb.put(MetaPostInfo.PING_URL, field.getVa=
lue());
=
- fieldName =3D containerNames.getValue(containerNames.TB_PING_I=
P);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.TB_P=
ING_IP);
field =3D tbContainer.getField(fieldName);
if (field !=3D null) tb.put(MetaPostInfo.PING_IP, field.getVal=
ue());
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/GetUserBlogsAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/GetUserBlogsAction.java&rev=
=3D18636&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/blogs/actions/GetU=
serBlogsAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/GetU=
serBlogsAction.java Mon Sep 24 17:44:19 2007
@@ -69,10 +69,7 @@
=
// Create commmon resources
super.init();
- =
- // First check that the user is registered to this site.
- final JahiaUser user =3D super.checkLogin();
- =
+
// Get all pages with template definition name "Blog"
final JahiaPageDefinition pageDef =3D
servicesRegistry.getJahiaPageTemplateService()
@@ -89,7 +86,10 @@
int blogPageId =3D ((Integer)blogPagesIdEnum.next()).intValue(=
);
=
ContentPage blogContentPage =3D super.changePage(blogPageId); =
=
- =
+
+ // First check that the user is registered to this site.
+ final JahiaUser user =3D super.checkLogin();
+
int deleteVersionID =3D blogContentPage.getDeleteVersionID();
=
// ignore all deleted pages
@@ -104,7 +104,7 @@
=
// get the entries container List
final String containerListName =3D super.containerNames.ge=
tValue(
- containerNames.BLOG_POSTS_LIST_NAME);
+ BlogDefinitionNames.BLOG_POSTS_LIST_NAME);
final int containerListID =3D containerService.getContaine=
rListID(
containerListName, blogPageId);
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/NewMediaObjectAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/NewMediaObjectAction.java&rev=
=3D18636&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/blogs/actions/NewM=
ediaObjectAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/NewM=
ediaObjectAction.java Mon Sep 24 17:44:19 2007
@@ -26,6 +26,7 @@
import org.jahia.services.webdav.DAVFileAccess;
=
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.pages.ContentPage;
=
import org.jahia.exceptions.JahiaException;
=
@@ -75,11 +76,13 @@
// Create commmon resources
super.init();
=
+ ContentPage blogContentPage =3D super.changePage(Integer.parseInt(=
blogID));
+
// First check that the user is registered to this site.
final JahiaUser user =3D super.checkLogin();
=
// Set the correct page and check write access
- if (!super.changePage(Integer.parseInt(blogID)).checkWriteAccess(u=
ser)) {
+ if (!blogContentPage.checkWriteAccess(user)) {
throw new JahiaException(
"You do not have write access to Blog: "+blogID,
"You do not have write access to Page: "+blogID,
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/action=
s/NewPostAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/blogs/actions/NewPostAction.java&rev=3D1863=
6&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/blogs/actions/NewP=
ostAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/blogs/actions/NewP=
ostAction.java Mon Sep 24 17:44:19 2007
@@ -39,6 +39,7 @@
import org.jahia.services.version.EntryLoadRequest;
=
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.pages.ContentPage;
=
import org.jahia.data.events.JahiaEvent;
=
@@ -109,11 +110,13 @@
// Create commmon resources
super.init();
=
+ ContentPage blogContentPage =3D super.changePage(Integer.parseInt(=
blogID));
+
// First check that the user is registered to this site.
JahiaUser user =3D super.checkLogin();
=
// Set the correct page and check write access
- if (!super.changePage(Integer.parseInt(blogID)).checkWriteAccess(u=
ser)) {
+ if (!blogContentPage.checkWriteAccess(user)) {
throw new JahiaException(
"You do not have write access to Blog: "+blogID,
"You do not have write access to Page: "+blogID,
@@ -123,7 +126,7 @@
=
// Name of the containerList containing all the posts of the blog
final String containerListName =3D super.containerNames.getValue(
- containerNames.BLOG_POSTS_LIST_NAME);
+ BlogDefinitionNames.BLOG_POSTS_LIST_NAME);
final int containerListID =3D containerService.getContainerListID(
containerListName, Integer.parseInt(blogID));
=
@@ -175,7 +178,7 @@
=
/* Set all the fields' value with the right data */
// set title field
- String fieldName =3D super.containerNames.getValue(containerNames.=
POST_TITLE);
+ String fieldName =3D super.containerNames.getValue(BlogDefinitionN=
ames.POST_TITLE);
String fieldValue =3D "";
=
// If content !=3D null -> we are using the Blogger API
@@ -206,19 +209,19 @@
field.setValue(fieldValue);
=
// set body field
- fieldName =3D super.containerNames.getValue(containerNames.POST_BO=
DY);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_BODY);
field =3D postContainer.getField(fieldName);
log.debug("Setting value of field: "+field.getID() +"; "+
field.getLanguageCode());
super.setValue(field, content);
=
// set posting date
- fieldName =3D super.containerNames.getValue(containerNames.POST_DA=
TE);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_DATE);
field =3D postContainer.getField(fieldName);
field.setObject(Long.toString(System.currentTimeMillis()));
=
// set the author of the message
- fieldName =3D super.containerNames.getValue(containerNames.POST_AU=
THOR);
+ fieldName =3D super.containerNames.getValue(BlogDefinitionNames.PO=
ST_AUTHOR);
field =3D postContainer.getField(fieldName);
log.debug("Setting value of field: "+field.getID() +"; "+
field.getLanguageCode());
@@ -227,7 +230,7 @@
// check if extra Movable Type are present in the struct
if (struct !=3D null) {
=
- fieldName =3D containerNames.getValue(containerNames.POST_EXCE=
RPT);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.POST=
_EXCERPT);
field =3D postContainer.getField(fieldName);
if (struct.containsKey(MetaPostInfo.MT_EXCERPT)) {
String excerpt =3D (String)struct.get(MetaPostInfo.MT_EXCE=
RPT);
@@ -237,7 +240,7 @@
}
}
=
- fieldName =3D containerNames.getValue(containerNames.POST_KEYW=
ORDS);
+ fieldName =3D containerNames.getValue(BlogDefinitionNames.POST=
_KEYWORDS);
field =3D postContainer.getField(fieldName);
if (struct.containsKey(MetaPostInfo.MT_KEYWORDS)) {
String keywords =3D (String)struct.get(MetaPostInfo.MT_KEY=
WORDS);
@@ -256,7 +259,7 @@
=
def =3D JahiaContainerDefinitionsRegistry.
getInstance().getDefinition(jParams.getSiteID(),
- containerNames.getValue(containerNames.BLOG_TB_PIN=
G_LIST));
+ containerNames.getValue(BlogDefinitionNames.BLOG_T=
B_PING_LIST));
=
JahiaContainerList pingURLs =3D null;
int ctnListID =3D -1;
@@ -297,7 +300,7 @@
ctnListID =3D pingURLContainer.getListID();
=
field =3D pingURLContainer.getField(containerNames.
- getValue(containerNames.TB_PING_URL));
+ getValue(BlogDefinitionNames.TB_PING_URL));
field.setValue(url);
=
containerService.saveContainer(pingURLContainer,
@@ -318,9 +321,6 @@
// publish the trackBack ping url container
super.activateContainer(pingURLContainer.getID(), =
user);
}
- =
- pingURLContainer =3D null;
- url =3D null;
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
