cmailleux 2005/11/25 17:25:38 CET
Modified files:
core/src/java/org/jahia/admin/production
ManageSiteProduction.java
core/src/java/org/jahia/services/importexport
ImportExportBaseService.java
ImportExportService.java
core/src/webapp/jsp/jahia/administration manage_production.jsp
core project.properties
Log:
Make production working under ie
Revision Changes Path
1.43 +3 -4 jahia/core/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.properties.diff?r1=1.42&r2=1.43&f=h
1.4 +4 -2
jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java.diff?r1=1.3&r2=1.4&f=h
1.51 +4 -1
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.50&r2=1.51&f=h
1.13 +1 -0
jahia/core/src/java/org/jahia/services/importexport/ImportExportService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportService.java.diff?r1=1.12&r2=1.13&f=h
1.7 +6 -9
jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp.diff?r1=1.6&r2=1.7&f=h
Index: ManageSiteProduction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/admin/production/ManageSiteProduction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManageSiteProduction.java 23 Nov 2005 13:38:21 -0000 1.3
+++ ManageSiteProduction.java 25 Nov 2005 16:25:37 -0000 1.4
@@ -187,7 +187,8 @@
StringBuffer targetSitesProperty = new StringBuffer();
boolean errors = false;
if (targetSites.length == usernames.length && targetSites.length ==
passwords.length &&
- targetSites.length == crons.length && targetSites.length ==
profiles.length) {
+ targetSites.length == crons.length && targetSites.length ==
profiles.length &&
+ targetSites.length==syncronizes.length) {
SimpleDateFormat simpleDateFormat = new
SimpleDateFormat("HH:mm");
for (int i = 0; i < targetSites.length; i++) {
String targetSite = targetSites[i].trim();
@@ -209,7 +210,7 @@
}
if (i > 0) targetSitesProperty.append(",");
URL url = new URL(targetSite);
- targetSite =
url.getProtocol().concat("://").concat(url.getHost()).concat(url.getPort() !=
80 ? ":" + url.getPort() : "");
+ String address =
url.getProtocol().concat("://").concat(url.getHost()).concat(url.getPort() !=
80 ? ":" + url.getPort() : "");
targetSitesProperty.append(targetSite);
if(url.getPath().length()>0) {
String[] paths =
url.getPath().substring(1).split("/");
@@ -223,6 +224,7 @@
settings.setProperty(ImportExportBaseService.PRODUCTION_CONTEXTNAME_PROPERTY +
targetSite,paths[0]);
settings.setProperty(ImportExportBaseService.PRODUCTION_SERVLETNAME_PROPERTY +
targetSite,paths[1]);
settings.setProperty(ImportExportBaseService.PRODUCTION_SITENAME_PROPERTY+targetSite,paths[3]);
+
settings.setProperty(ImportExportBaseService.PRODUCTION_ADDRESS_PROPERTY+targetSite,address);
} else {
String warningMsg =
JahiaResourceBundle.getAdminResource("org.jahia.admin.productionManager.error.targetSite",
jParams, jParams.getLocale());
Index: ImportExportBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ImportExportBaseService.java 25 Nov 2005 14:18:22 -0000 1.50
+++ ImportExportBaseService.java 25 Nov 2005 16:25:37 -0000 1.51
@@ -936,13 +936,16 @@
} else {
jobDetail =
schedulerServ.getJobDetail(ProductionJob.JOB_NAME_PREFIX + site.getID() + "_" +
targetSite,
ProductionJob.JOB_GROUP_NAME);
+ if(jobDetail==null)
+ jobDetail = new
JobDetail(ProductionJob.JOB_NAME_PREFIX + site.getID() + "_" + targetSite,
+
ProductionJob.JOB_GROUP_NAME, ProductionJob.class);
}
schedulerServ.deleteJob(ProductionJob.JOB_NAME_PREFIX +
site.getID() + "_" + targetSite,
ProductionJob.JOB_GROUP_NAME);
jobDetail.setRequestsRecovery(true);
JobDataMap jobDataMap = jobDetail.getJobDataMap();
jobDataMap.put(ProductionJob.SITE_ID, site.getID());
- jobDataMap.put(ProductionJob.TARGET_NAME, targetSite);
+ jobDataMap.put(ProductionJob.TARGET_NAME,
siteSettings.getProperty(PRODUCTION_ADDRESS_PROPERTY+targetSite,""));
jobDataMap.put(ProductionJob.USERNAME,siteSettings.getProperty(PRODUCTION_USERNAME_PROPERTY
+ targetSite, ""));
jobDataMap.put(ProductionJob.PASSWORD,siteSettings.getProperty(PRODUCTION_PASSWORD_PROPERTY
+ targetSite, ""));
jobDataMap.put(ProductionJob.PROFILE,siteSettings.getProperty(PRODUCTION_PROFILE_PROPERTY
+ targetSite, ""));
Index: ImportExportService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ImportExportService.java 23 Nov 2005 13:38:21 -0000 1.12
+++ ImportExportService.java 25 Nov 2005 16:25:37 -0000 1.13
@@ -45,6 +45,7 @@
String PRODUCTION_SITENAME_PROPERTY = "prod_sitename_";
String PRODUCTION_SYNCRONIZE_PROPERTY = "prod_syncronize_";
String PRODUCTION_CONTEXTNAME_PROPERTY = "prod_context_";
+ String PRODUCTION_ADDRESS_PROPERTY = "prod_address_";
Document export(ContentObject object, String languageCodes,
ProcessingContext jParams, Set included) throws JahiaException, SAXException;
Index: manage_production.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- manage_production.jsp 23 Nov 2005 13:38:22 -0000 1.6
+++ manage_production.jsp 25 Nov 2005 16:25:38 -0000 1.7
@@ -15,7 +15,7 @@
padding: 2px;
background-color: lightyellow;
visibility: hidden;
- z-index: 1000;
+ z-index: 10000;
font-size: 8pt; /*Remove below line to remove shadow. Below line
should always appear last within this CSS*/
filter: progid: DXImageTransform . Microsoft . Shadow( color = gray,
direction = 135 );
}
@@ -61,17 +61,14 @@
String password = new
String(org.apache.axis.encoding.Base64.decode(settings.getProperty(ImportExportService.PRODUCTION_PASSWORD_PROPERTY+targetSite,"")));
String cron =
settings.getProperty(ImportExportService.PRODUCTION_CRON_PROPERTY+targetSite,"");
String profile =
settings.getProperty(ImportExportService.PRODUCTION_PROFILE_PROPERTY+targetSite,"");
- String sitename =
settings.getProperty(ImportExportService.PRODUCTION_SITENAME_PROPERTY+targetSite,"");
- String servletname =
settings.getProperty(ImportExportService.PRODUCTION_SERVLETNAME_PROPERTY+targetSite,"");
- String contextname =
settings.getProperty(ImportExportService.PRODUCTION_CONTEXTNAME_PROPERTY+targetSite,"");
- targetSite =
targetSite.concat("/").concat(contextname).concat("/").concat(servletname).concat("/site/").concat(sitename);
+ String syncronize =
settings.getProperty(ImportExportService.PRODUCTION_SYNCRONIZE_PROPERTY+targetSite,"");
%>
targetSites[<%=i%>] = '<%=targetSite%>';
usernames[<%=i%>] = '<%=username%>';
passwords[<%=i%>] = '<%=password%>';
crons[<%=i%>] = '<%=cron%>';
profiles[<%=i%>] = '<%=profile%>';
- syncronizes[<%=i%>] = 'yes';
+ syncronizes[<%=i%>] = '<%=syncronize%>';
<%}%>
function selectTarget(id) {
@@ -81,7 +78,7 @@
form.password.value=passwords[id];
form.cron.value=crons[id];
form.profile.value=profiles[id];
- if(syncronizes[id] == 'yes') {
+ if(syncronizes[id] == "yes") {
form.syncronize.checked=true;
} else {
form.syncronize.checked=false;
@@ -113,8 +110,8 @@
}
}
function validateForm(){
+ var regexp = /[\w:\/\*\?\-,#]/ig;
var form = document.mainForm;
- var regexp = new RegExp("[\\w:\\/\\*\\?-,#]","ig");
if(!form.targetSite.value.match(regexp)) {
alert('<jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.form.error.required.targetSite"/>');
return false;
@@ -445,7 +442,7 @@
<script type="text/javascript">
/***********************************************
- * Cool DHTML tooltip script- © Dynamic Drive DHTML code library
(www.dynamicdrive.com)
+ * Cool DHTML tooltip script- é Dynamic Drive DHTML code library
(www.dynamicdrive.com)
* This notice MUST stay intact for legal use
* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source
code
***********************************************/
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.properties,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- project.properties 3 Nov 2005 13:22:20 -0000 1.42
+++ project.properties 25 Nov 2005 16:25:38 -0000 1.43
@@ -63,9 +63,8 @@
# Set to true if you want JSP precompilation to happen after war:webapp goal
-precompile.jsp=true
-maven.jahiawar.precompile.jsp = true
-
+precompile.jsp=false
+maven.jahiawar.precompile.jsp = false
# Tomcat deployment locations
tomcat.home=${catalina.home.dir}
catalina.shared.lib=${catalina.home.dir}/shared/lib/
@@ -109,4 +108,4 @@
maven.junit.fork = yes
maven.test.skip = true
-maven.compile.deprecation = off
+maven.compile.deprecation = off
\ No newline at end of file
