cvs commit: jahia/core/src/java/org/jahia/bin Jahia.java jahia/core/src/java/org/jahia/services/importexport ImportHandler.java

[Thomas Draier]

tdraier     2005/11/28 17:23:14 CET

  Modified files:
    core/src/java/org/jahia/bin Jahia.java 
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  add a serverport info, needed for template preload when importing with 
clusters
  
  Revision  Changes    Path
  1.37      +10 -1     jahia/core/src/java/org/jahia/bin/Jahia.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/Jahia.java.diff?r1=1.36&r2=1.37&f=h
  1.51      +2 -1      
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.50&r2=1.51&f=h
  
  
  
  Index: Jahia.java
  ===================================================================
  RCS file: /home/cvs/repository/jahia/core/src/java/org/jahia/bin/Jahia.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Jahia.java        25 Nov 2005 17:26:38 -0000      1.36
  +++ Jahia.java        28 Nov 2005 16:23:13 -0000      1.37
  @@ -1,4 +1,4 @@
  -// $Id: Jahia.java,v 1.36 2005/11/25 17:26:38 xlawrence Exp $
  +// $Id: Jahia.java,v 1.37 2005/11/28 16:23:13 tdraier Exp $
   //
   //                                   ____.
   //                       __/\ ______|    |__/\.     _______
  @@ -190,6 +190,7 @@
       static private String relativeServletURI;
       static private String jahiaServletPath;
       static private String jahiaContextPath;
  +    static private int jahiaHttpPort = -1;
   
       static private String jahiaInitAdminServletPath;
       static private String jahiaInitConfigServletPath;
  @@ -698,6 +699,10 @@
   
               }
   
  +            if (Jahia.jahiaHttpPort == -1) {
  +                Jahia.jahiaHttpPort = request.getServerPort();
  +            }
  +
               // check witch action to do...
               if (mInitWarning) { // init error, stop Jahia...
                   if (initException != null) {
  @@ -992,6 +997,10 @@
           return jahiaContextPath;
       }
   
  +    public static int getJahiaHttpPort() {
  +        return jahiaHttpPort;
  +    }
  +
       public static String getInitAdminServletPath () {
           return jahiaInitAdminServletPath;
       }
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- ImportHandler.java        23 Nov 2005 18:29:41 -0000      1.50
  +++ ImportHandler.java        28 Nov 2005 16:23:13 -0000      1.51
  @@ -43,6 +43,7 @@
   import org.jahia.services.metadata.CoreMetadataConstant;
   import org.jahia.services.workflow.WorkflowEvent;
   import org.jahia.utils.LanguageCodeConverters;
  +import org.jahia.bin.Jahia;
   import org.springframework.transaction.PlatformTransactionManager;
   import org.springframework.transaction.TransactionStatus;
   import 
org.springframework.transaction.support.TransactionCallbackWithoutResult;
  @@ -564,7 +565,7 @@
                   /// Try again after page load
                   try {
                       logger.debug("Cannot find definitions, try to initialize 
page");
  -                    URL url = new 
URL("http://localhost:"+jParams.getServerPort() + 
jParams.composePageUrl(pageID));
  +                    URL url = new URL("http://localhost:"+ 
Jahia.getJahiaHttpPort() + jParams.composePageUrl(pageID));
                       HttpURLConnection urlConn = (HttpURLConnection) 
url.openConnection();
                       TokenAuthValveImpl.addToken(jParams.getUser() , urlConn);
                       urlConn.getContentLength();