Author: tdraier
Date: Fri Jan 18 16:29:53 2008
New Revision: 19542
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19542&repname=
=3Djahia
Log:
fixed site creation
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/JCRStoreProvider.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/sites/JahiaSitesBaseService.java
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/content/JCRStoreProvider.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/JCRStoreProv=
ider.java&rev=3D19542&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/JCRStoreProvider.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/JCRStoreProvider.java Fri Jan 18 16:29:53 2008
@@ -328,39 +328,42 @@
=
=
public void deployNewSite(JahiaSite site, JahiaUser user) throws Repos=
itoryException {
- Session session =3D getThreadSession(user);
-
- Query q =3D session.getWorkspace().getQueryManager().createQuery("=
SELECT * FROM jmix:virtualsitesFolder", Query.SQL);
- QueryResult qr =3D q.execute();
- NodeIterator ni =3D qr.getNodes();
+ Session session =3D getSystemSession(user.getUsername());
try {
- while (ni.hasNext()) {
- Node sitesFolder =3D ni.nextNode();
- String options =3D "";
- if (sitesFolder.hasProperty("j:virtualsitesFolderConfig"))=
{
- options =3D sitesFolder.getProperty("j:virtualsitesFol=
derConfig").getString();
- }
-
- Node f =3D getPathFolder(sitesFolder, site.getSiteKey(), o=
ptions);
- try {
- f.getNode(site.getSiteKey());
- } catch (PathNotFoundException e) {
- if (sitesFolder.hasProperty("j:virtualsitesFolderSkele=
ton")) {
- session.importXML(f.getPath(), new FileInputStream=
(Jahia.getSettings().getJahiaEtcDiskPath() + "/repository/"+ sitesFolder.ge=
tProperty("j:virtualsitesFolderSkeleton").getString()),ImportUUIDBehavior.I=
MPORT_UUID_CREATE_NEW);
- session.move(f.getPath()+"/site", f.getPath()+"/"+=
site.getSiteKey());
- } else {
- f.addNode(site.getSiteKey(), Constants.JAHIANT_VIR=
TUALSITE);
+ Query q =3D session.getWorkspace().getQueryManager().createQue=
ry("SELECT * FROM jmix:virtualsitesFolder", Query.SQL);
+ QueryResult qr =3D q.execute();
+ NodeIterator ni =3D qr.getNodes();
+ try {
+ while (ni.hasNext()) {
+ Node sitesFolder =3D ni.nextNode();
+ String options =3D "";
+ if (sitesFolder.hasProperty("j:virtualsitesFolderConfi=
g")) {
+ options =3D sitesFolder.getProperty("j:virtualsite=
sFolderConfig").getString();
}
=
- Node siteNode =3D f.getNode(site.getSiteKey());
- siteNode.setProperty("j:name", site.getSiteKey());
- siteNode.setProperty("j:server", site.getServerName());
+ Node f =3D getPathFolder(sitesFolder, site.getSiteKey(=
), options);
+ try {
+ f.getNode(site.getSiteKey());
+ } catch (PathNotFoundException e) {
+ if (sitesFolder.hasProperty("j:virtualsitesFolderS=
keleton")) {
+ session.importXML(f.getPath(), new FileInputSt=
ream(Jahia.getSettings().getJahiaEtcDiskPath() + "/repository/"+ sitesFolde=
r.getProperty("j:virtualsitesFolderSkeleton").getString()),ImportUUIDBehavi=
or.IMPORT_UUID_CREATE_NEW);
+ session.move(f.getPath()+"/site", f.getPath()+=
"/"+site.getSiteKey());
+ } else {
+ f.addNode(site.getSiteKey(), Constants.JAHIANT=
_VIRTUALSITE);
+ }
+
+ Node siteNode =3D f.getNode(site.getSiteKey());
+ siteNode.setProperty("j:name", site.getSiteKey());
+ siteNode.setProperty("j:server", site.getServerNam=
e());
=
- session.save();
+ session.save();
+ }
}
+ } catch (IOException e) {
+ e.printStackTrace();
}
- } catch (IOException e) {
- e.printStackTrace();
+ } finally {
+ session.logout();
}
}
=
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/sites/JahiaSitesBaseService.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/sites/JahiaSitesBase=
Service.java&rev=3D19542&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/sites/JahiaSitesBaseService.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/sites/JahiaSitesBaseService.java Fri Jan 18 16:29:53 2008
@@ -21,6 +21,7 @@
//
package org.jahia.services.sites;
=
+import org.jahia.bin.Jahia;
import org.jahia.data.JahiaDOMObject;
import org.jahia.data.events.JahiaEvent;
import org.jahia.exceptions.JahiaException;
@@ -31,15 +32,15 @@
import org.jahia.services.cache.Cache;
import org.jahia.services.cache.CacheService;
import org.jahia.services.deamons.filewatcher.JahiaFileWatcherService;
+import org.jahia.services.pages.JahiaPageBaseService;
import org.jahia.services.usermanager.JahiaGroupManagerService;
import org.jahia.services.webapps_deployer.JahiaWebAppsDeployerService;
-import org.jahia.services.pages.JahiaPageBaseService;
import org.jahia.settings.SettingsBean;
=
import java.util.Enumeration;
import java.util.List;
-import java.util.Vector;
import java.util.Properties;
+import java.util.Vector;
=
=
/**
@@ -307,7 +308,7 @@
=
ServicesRegistry.getInstance().getJahiaSearchService()
.createSearchHandler(site.getID());
- ServicesRegistry.getInstance().getJahiaEventService().fireSite=
Added(new JahiaEvent(this,null,site));
+ ServicesRegistry.getInstance().getJahiaEventService().fireSite=
Added(new JahiaEvent(this, Jahia.getThreadParamBean() , site));
return true;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
