Author: tdraier
Date: Fri Jan 18 17:44:43 2008
New Revision: 19545
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19545&repname=
=3Djahia
Log:
fixed auto-export on distant site ( gui should be refactored - only works w=
ith default repository config )
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/automation/Service.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/importexport/ImportExportBaseService.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
repository/root.xml
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/content/automation/Service.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/content/automation/S=
ervice.java&rev=3D19545&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-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/automation/Service.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/automation/Service.java Fri Jan 18 17:44:43 2008
@@ -127,8 +127,15 @@
logger.info("Export received from site "+uri);
ServicesRegistry registry =3D ServicesRegistry.getInstance=
();
ImportExportService importExportService =3D registry.getIm=
portExportService();
+ String siteKey =3D "";
+ int j =3D uri.indexOf("_toSite_");
+ if ( j > -1 ) {
+ siteKey =3D uri.substring(j+8,uri.lastIndexOf('_'));
+ } else {
// String siteKey =3D m.getNamespaceAccessToken().getName();
- JahiaSite siteByKey =3D registry.getJahiaSitesService().ge=
tSiteByKey("xx");
+
+ }
+ JahiaSite siteByKey =3D registry.getJahiaSitesService().ge=
tSiteByKey(siteKey);
JahiaUser member =3D ServicesRegistry.getInstance().getJah=
iaSiteUserManagerService().getMember(siteByKey.getID(), user.getName());
ContentPage homeContentPage =3D siteByKey.getHomeContentPa=
ge();
=
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/importexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/importexport/ImportE=
xportBaseService.java&rev=3D19545&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-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/importexport/ImportExportBaseService.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/importexport/ImportExportBaseService.java Fri Jan 18 17:44:43 2008
@@ -2258,17 +2258,9 @@
password =3D new String(Base64.decode(password));
UsernamePasswordCredentials credentials =3D new UsernamePasswordCr=
edentials(username, password);
=
- String folder =3D targetName + "/" + contextname + "/repository/de=
fault" + sitename + "/users/" + username + "/private/imports";
- HttpURL folderURL =3D new HttpURL(folder);
- WebdavResource folderRes =3D new WebdavResource(folderURL, credent=
ials, WebdavResource.NOACTION, 0);
- if (!folderRes.exists()) {
- if (!folderRes.mkcolMethod()) {
- throw new IOException();
- }
- }
-
- String name =3D "importFromSite_" + site.getSiteKey() + "_" + date=
OfExport + ".zip";
- String url =3D targetName + "/" + contextname + "/repository/defau=
lt" + sitename + "/users/" + username + "/private/imports/"+ name;
+ sitename =3D sitename.substring(sitename.lastIndexOf('/')+1);
+ String name =3D "importFromSite_" + site.getSiteKey() + "_toSite_"=
+ sitename+ "_" + dateOfExport + ".zip";
+ String url =3D targetName + "/" + contextname + "repository/defaul=
t/content/users/" + username + "/private/imports/"+ name;
HttpURL httpURL =3D new HttpURL(url);
WebdavResource webdavSession =3D new WebdavResource(httpURL, crede=
ntials, WebdavResource.NOACTION, 0);
//might be necessary for ESI
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-IN=
F/etc/repository/root.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/repository/root.xml&rev=
=3D19545&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-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
repository/root.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
repository/root.xml Fri Jan 18 17:44:43 2008
@@ -6,6 +6,6 @@
=
<shared jcr:primaryType=3D"jnt:folder" j:applyAcl=3D"g:users:rw" />
=
- <users jcr:primaryType=3D"jnt:systemfolder" jcr:mixinTypes=3D"jmix:use=
rsFolder" j:usersFolderConfig=3D"initials" j:usersFolderSkeleton=3D"user.xm=
l"/>
+ <users jcr:primaryType=3D"jnt:systemfolder" jcr:mixinTypes=3D"jmix:use=
rsFolder" j:usersFolderSkeleton=3D"user.xml"/>
=
</content>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
