shuber 2005/11/07 17:02:26 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
. jahia-JAHIA-4-1-BRANCH.iws
src/java/org/jahia/services/pages ContentPage.java
JahiaPageInfo.java
Log:
JAHIA-432
- Added possibility to set remote URL without changing page type.
Revision Changes Path
1.1.2.6 +53 -32 jahia/jahia-JAHIA-4-1-BRANCH.iws
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/jahia-JAHIA-4-1-BRANCH.iws.diff?r1=1.1.2.5&r2=1.1.2.6&f=h
1.72.2.19.2.3 +19 -0
jahia/src/java/org/jahia/services/pages/ContentPage.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/pages/ContentPage.java.diff?r1=1.72.2.19.2.2&r2=1.72.2.19.2.3&f=h
1.14.2.1.2.1 +11 -1
jahia/src/java/org/jahia/services/pages/JahiaPageInfo.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/pages/JahiaPageInfo.java.diff?r1=1.14.2.1&r2=1.14.2.1.2.1&f=h
Index: jahia-JAHIA-4-1-BRANCH.iws
===================================================================
RCS file: /home/cvs/repository/jahia/Attic/jahia-JAHIA-4-1-BRANCH.iws,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- jahia-JAHIA-4-1-BRANCH.iws 7 Nov 2005 15:39:26 -0000 1.1.2.5
+++ jahia-JAHIA-4-1-BRANCH.iws 7 Nov 2005 16:02:25 -0000 1.1.2.6
@@ -122,7 +122,7 @@
<file leaf-file-name="DAVFilemanager_Engine.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.04009434">
+ <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
@@ -131,7 +131,7 @@
<file leaf-file-name="AbstractAction.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038724374">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.034274194">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -142,7 +142,7 @@
<file leaf-file-name="JahiaUserManagerLDAPProvider.java"
pinned="false" current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.04009434">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
@@ -151,7 +151,7 @@
<file leaf-file-name="ConnectionDispenser.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.04009434">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
@@ -160,7 +160,7 @@
<file leaf-file-name="JahiaErrorDisplay.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.04009434">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
@@ -169,34 +169,34 @@
<file leaf-file-name="JahiaPageBaseService.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageBaseService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.6580189">
+ <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.5800416">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JahiaPagesDB.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPagesDB.java">
+ <file leaf-file-name="SiteIndexationStatus.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/search/SiteIndexationStatus.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="668" column="20" selection-start="28082"
selection-end="28082" vertical-scroll-proportion="1.5400944">
+ <state line="11" column="13" selection-start="237"
selection-end="237" vertical-scroll-proportion="0.29435483">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JahiaACLManagerService.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/acl/JahiaACLManagerService.java">
+ <file leaf-file-name="ContentPage.java" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="211" column="34" selection-start="7074"
selection-end="7074" vertical-scroll-proportion="0.9787736">
+ <state line="1287" column="28" selection-start="49478"
selection-end="49478" vertical-scroll-proportion="0.5280665">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ParamBean.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/ParamBean.java">
+ <file leaf-file-name="JahiaPageInfo.java" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageInfo.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.04009434">
+ <state line="362" column="32" selection-start="11940"
selection-end="11940" vertical-scroll-proportion="0.7047817">
<folding />
</state>
</provider>
@@ -205,7 +205,7 @@
<file leaf-file-name="DummyServletRequestWrapper.java" pinned="false"
current="true" current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="27" selection-start="941"
selection-end="941" vertical-scroll-proportion="0.9567198">
+ <state line="22" column="0" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.3326613">
<folding />
</state>
</provider>
@@ -673,14 +673,14 @@
</component>
<component name="ToolWindowManager">
<frame x="1" y="1" width="1275" height="992" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="7" />
<window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.36958298" order="0" />
<window_info id="Find" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33333334" order="8" />
+ <window_info id="Messages" active="true" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.33333334" order="8" />
<window_info id="Inspection" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.4" order="6" />
<window_info id="Profile" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
@@ -690,7 +690,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="true"
weight="0.39930555" order="4" />
+ <window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.39930555" order="4" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="sliding" type="sliding" visible="false"
weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="docked" type="docked" visible="false"
weight="0.33" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
@@ -776,13 +776,6 @@
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="27" selection-start="941"
selection-end="941" vertical-scroll-proportion="0.9567198">
- <folding />
- </state>
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/ParamBean.java">
<provider selected="true" editor-type-id="text-editor">
<state line="566" column="12" selection-start="23402"
selection-end="23402" vertical-scroll-proportion="0.04009434">
@@ -804,37 +797,65 @@
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="0" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.3326613">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageInfo.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="362" column="32" selection-start="11940"
selection-end="11940" vertical-scroll-proportion="0.7047817">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/ContentPage.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1287" column="28" selection-start="49478"
selection-end="49478" vertical-scroll-proportion="0.5280665">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/search/SiteIndexationStatus.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="13" selection-start="237"
selection-end="237" vertical-scroll-proportion="0.29435483">
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageBaseService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.6580189">
+ <state line="1883" column="34" selection-start="76499"
selection-end="76499" vertical-scroll-proportion="0.5800416">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/bin/JahiaErrorDisplay.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.04009434">
+ <state line="367" column="52" selection-start="15415"
selection-end="15415" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/database/ConnectionDispenser.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.04009434">
+ <state line="218" column="39" selection-start="7793"
selection-end="7793" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.04009434">
+ <state line="1661" column="33" selection-start="65829"
selection-end="65829" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/blogs/actions/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.038724374">
+ <state line="282" column="16" selection-start="10627"
selection-end="10627" vertical-scroll-proportion="0.034274194">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -843,7 +864,7 @@
</entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.04009434">
+ <state line="701" column="80" selection-start="30741"
selection-end="30741" vertical-scroll-proportion="0.035343036">
<folding />
</state>
</provider>
Index: ContentPage.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/pages/Attic/ContentPage.java,v
retrieving revision 1.72.2.19.2.2
retrieving revision 1.72.2.19.2.3
diff -u -r1.72.2.19.2.2 -r1.72.2.19.2.3
--- ContentPage.java 13 Sep 2005 09:34:53 -0000 1.72.2.19.2.2
+++ ContentPage.java 7 Nov 2005 16:02:25 -0000 1.72.2.19.2.3
@@ -1280,6 +1280,25 @@
//-------------------------------------------------------------------------
/**
+ * Set the new remote URL. The page type will NOT change.
+ *
+ * @param value The new remoteURL.
+ * @param jParams a ParamBean object used to specify for which version/
+ * language we are setting the RemoteURL (basically this makes sure we
have
+ * a staged version and that we have an entry for the current language).
+ */
+ public final void setRemoteURLWithoutType (String value,
EntryLoadRequest loadRequest)
+ throws JahiaException {
+ Vector pageInfos = getAllPageInfosForWrite (loadRequest);
+ Enumeration pageInfosEnum = pageInfos.elements ();
+ while (pageInfosEnum.hasMoreElements ()) {
+ JahiaPageInfo curPageInfo = (JahiaPageInfo)
pageInfosEnum.nextElement ();
+ curPageInfo.setRemoteURLWithoutType(value);
+ }
+ }
+
+
//-------------------------------------------------------------------------
+ /**
* Change the page title.
*
* @param value String holding the new page title.
Index: JahiaPageInfo.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/pages/Attic/JahiaPageInfo.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.1.2.1
diff -u -r1.14.2.1 -r1.14.2.1.2.1
--- JahiaPageInfo.java 28 Jul 2004 15:27:27 -0000 1.14.2.1
+++ JahiaPageInfo.java 7 Nov 2005 16:02:26 -0000 1.14.2.1.2.1
@@ -1,4 +1,4 @@
-// $Id: JahiaPageInfo.java,v 1.14.2.1 2004/07/28 15:27:27 shuber Exp $
+// $Id: JahiaPageInfo.java,v 1.14.2.1.2.1 2005/11/07 16:02:26 shuber Exp $
//
//
// ____.
@@ -353,6 +353,16 @@
mDataChanged = true;
}
+
//-------------------------------------------------------------------------
+ /**
+ * Set the new remote URL. The page type will NOT change accordingly.
+ *
+ * @param value The new remoteURL.
+ */
+ public synchronized void setRemoteURLWithoutType (String value) {
+ mTempRemoteURL = value;
+ mDataChanged = true;
+ }
//-------------------------------------------------------------------------
/**
