Author: sshyrkov
Date: Mon Nov 19 16:34:34 2007
New Revision: 19223
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19223&repname=
=3Djahia
Log:
Cleanup deprecated API calls, unused local variables. Removed unused import=
statements.
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ActivationContentPickerJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/PermissionsImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ProductionJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/VersionNumberHandler.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/ActivationContentPickerJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/ActivationConten=
tPickerJob.java&rev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ActivationContentPickerJob.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ActivationContentPickerJob.java Mon Nov 19 16:34:34 2007
@@ -46,8 +46,6 @@
private static org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(ActivationContentPickerJob.c=
lass);
=
- private static ThreadLocal isInContentPickJob =3D new ThreadLocal();
-
public static final String PICKED_TYPE =3D "picked";
=
public static final String PICKER =3D "picker";
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/ImportHandler.ja=
va&rev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportHandler.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportHandler.java Mon Nov 19 16:34:34 2007
@@ -39,7 +39,6 @@
import org.jahia.hibernate.manager.JahiaSiteLanguageListManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.hibernate.model.JahiaAclEntry;
-import org.jahia.hibernate.model.JahiaRetentionRule;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.JahiaContainerDefinitionsRegistry;
import org.jahia.registries.JahiaFieldDefinitionsRegistry;
@@ -424,9 +423,9 @@
// transfer lock from parent to current
LockKey lock;
if (parent !=3D null) {
- lock =3D LockKey.composeLockKey(LockKey.ADD_ACTION=
+ "_" + parent.getObjectKey().getType(), parent.getID(), parent.getID());
+ lock =3D LockKey.composeLockKey(LockKey.ADD_ACTION=
+ "_" + parent.getObjectKey().getType(), parent.getID());
} else {
- lock =3D LockKey.composeLockKey(LockKey.IMPORT_ACT=
ION + "_SITE", site.getID(), site.getID());
+ lock =3D LockKey.composeLockKey(LockKey.IMPORT_ACT=
ION + "_SITE", site.getID());
}
=
// transfer lock from parent to current
@@ -434,7 +433,7 @@
List linfos =3D lockReg.getInfo(lock);
if (!linfos.isEmpty()) {
Map infos =3D (Map) linfos.iterator().next();
- LockKey newlock =3D LockKey.composeLockKey(LockKey=
.IMPORT_ACTION + "_" + currentObject.getObjectKey().getType(), currentObjec=
t.getID(), currentObject.getID());
+ LockKey newlock =3D LockKey.composeLockKey(LockKey=
.IMPORT_ACTION + "_" + currentObject.getObjectKey().getType(), currentObjec=
t.getID());
JahiaUser owner =3D (JahiaUser) infos.get(LockRegi=
stry.OWNER);
String lockID =3D (String) infos.get(LockRegistry.=
ID);
lockReg.acquire(newlock, owner, lockID, (int) (((L=
ong) infos.get(LockRegistry.TIMEOUT)).longValue()/1000));
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/ImportJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/ImportJob.java&r=
ev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportJob.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportJob.java Mon Nov 19 16:34:34 2007
@@ -80,7 +80,7 @@
=
try {
if (imported !=3D null) {
- LockKey lock =3D LockKey.composeLockKey(LockKey.IMPORT_ACT=
ION + "_" + imported.getObjectKey().getType(), imported.getID(), imported.g=
etID());
+ LockKey lock =3D LockKey.composeLockKey(LockKey.IMPORT_ACT=
ION + "_" + imported.getObjectKey().getType(), imported.getID());
((Set)jobDataMap.get(JOB_LOCKS)).add(lock);
}
} catch (Exception e) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/PermissionsImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/PermissionsImpor=
tHandler.java&rev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/PermissionsImportHandler.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/PermissionsImportHandler.java Mon Nov 19 16:34:34 2007
@@ -16,25 +16,26 @@
* limitations under the License.
*/package org.jahia.services.importexport;
=
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
import org.apache.log4j.Logger;
import org.jahia.exceptions.JahiaException;
-import org.jahia.params.ProcessingContext;
+import org.jahia.hibernate.model.JahiaAcl;
+import org.jahia.hibernate.model.JahiaAclEntry;
+import org.jahia.hibernate.model.JahiaAclName;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.usermanager.*;
import org.jahia.services.pages.ContentPage;
-import org.jahia.services.acl.JahiaBaseACL;
-import org.jahia.services.acl.JahiaACLEntry;
-import org.jahia.hibernate.model.JahiaAclName;
-import org.jahia.hibernate.model.JahiaAclEntry;
-import org.jahia.hibernate.model.JahiaAcl;
+import org.jahia.services.usermanager.JahiaGroup;
+import org.jahia.services.usermanager.JahiaGroupManagerService;
+import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.usermanager.JahiaUserManagerService;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
=
-import java.security.Principal;
-import java.util.*;
-
/**
* Created by IntelliJ IDEA.
* User: toto
@@ -46,13 +47,10 @@
private static Logger logger =3D Logger.getLogger(UsersImportHandler.c=
lass);
private JahiaUserManagerService u;
private JahiaGroupManagerService g;
- private JahiaSiteUserManagerService su;
- private JahiaSiteGroupManagerService sg;
private int siteId;
private String prefix;
private List uuidProps =3D new ArrayList();
=
- private JahiaGroup currentGroup =3D null;
private boolean member =3D false;
private String nodeName;
=
@@ -62,8 +60,6 @@
this.siteId =3D siteId;
u =3D ServicesRegistry.getInstance().getJahiaUserManagerService();
g =3D ServicesRegistry.getInstance().getJahiaGroupManagerService();
- su =3D ServicesRegistry.getInstance().getJahiaSiteUserManagerServi=
ce();
- sg =3D ServicesRegistry.getInstance().getJahiaSiteGroupManagerServ=
ice();
}
=
public void startElement(String uri, String localName, String qName, A=
ttributes attributes) throws SAXException {
@@ -105,8 +101,6 @@
public void endElement(String uri, String localName, String qName) thr=
ows SAXException {
if (member) {
member =3D false;
- } else if (localName.equals("group")) {
- currentGroup =3D null;
}
}
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/ProductionJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/ProductionJob.ja=
va&rev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ProductionJob.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ProductionJob.java Mon Nov 19 16:34:34 2007
@@ -86,7 +86,7 @@
if (logger.isDebugEnabled())
logger.debug("Calling execute of ProductionJob for=
site " + siteID + " exporting to " + targetName);
=
- LockKey lock =3D LockKey.composeLockKey(LockKey.LIVEEX=
PORT_PAGE_TYPE, site.getHomePageID(), site.getHomePageID());
+ LockKey lock =3D LockKey.composeLockKey(LockKey.LIVEEX=
PORT_PAGE_TYPE, site.getHomePageID());
try {
if (ServicesRegistry.getInstance().getLockService(=
).acquire(lock, member, jobDetail.getName(), BackgroundJob.getMaxExecutionT=
ime()))
{
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/importexport/VersionNumberHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/importexport/VersionNumberHan=
dler.java&rev=3D19223&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/VersionNumberHandler.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/VersionNumberHandler.java Mon Nov 19 16:34:34 2007
@@ -20,8 +20,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.params.ProcessingContext;
-import org.jahia.exceptions.JahiaException;
=
import java.util.Map;
import java.util.HashMap;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
