Permalink
Browse files

V.9-09/04/2012

  • Loading branch information...
2 parents befe7f4 + 81b81b0 commit 13ac6182007f46b73e7eecfb067255cbb27b6363 @ngasiproj committed Sep 5, 2012
View
@@ -1,5 +1,9 @@
#!/bin/sh
+<<<<<<< HEAD
#cd $CAIMITO_HOME/bin
+=======
+cd $CAIMITO_HOME/bin
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
export JAVA_OPTS="-Dsun.net.inetaddr.ttl=0 -Dnetworkaddress.cache.ttl=0"
View
@@ -1,10 +1,17 @@
----------------------------------------------------------------
+<<<<<<< HEAD
Tue Sep 04 01:27:13 PDT 2012:
Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0139-9063-f3d7-000002bafa60
on database directory /home/idrive/caimito/bin/caimito_db with class loader org.apache.catalina.loader.StandardClassLoader@1df5a8f
Loaded from file:/home/idrive/caimito/lib/derby.jar
+=======
+Mon Jun 18 07:38:38 EDT 2012:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0137-ff63-2b87-000002f69fb8
+on database directory /usr/caimito/bin/caimito_db with class loader org.apache.catalina.loader.StandardClassLoader@2a4983
+Loaded from file:/usr/caimito/lib/derby.jar
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
java.vendor=Sun Microsystems Inc.
java.runtime.version=1.6.0_24-b07
-user.dir=/home/idrive/caimito/bin
+user.dir=/usr/caimito/bin
derby.system.home=null
Database Class Loader started - derby.database.classpath=''
View
@@ -66,20 +66,33 @@
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8619
+<<<<<<< HEAD
--> <!--
<Connector port="8619" protocol="org.apache.coyote.http11.Http11NioProtocol"
connectionTimeout="20000"
redirectPort="8639" /> -->
<!-- A "Connector" using the shared thread pool
+=======
+ -->
+ <Connector port="8619" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8639" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
<Connector executor="tomcatThreadPool"
port="8619" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8639" />
+<<<<<<< HEAD
-->
<Connector port="8619" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8639" />
+=======
+ -->
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
<!-- Define a SSL HTTP/1.1 Connector on port 8639
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
@@ -90,9 +103,15 @@
clientAuth="false" sslProtocol="TLS" />
-->
+<<<<<<< HEAD
<!-- Define an AJP 1.3 Connector on port 8659
<Connector port="8659" protocol="AJP/1.3" redirectPort="8639" />
-->
+=======
+ <!-- Define an AJP 1.3 Connector on port 8659 -->
+ <Connector port="8659" protocol="AJP/1.3" redirectPort="8639" />
+
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
@@ -0,0 +1,34 @@
+Jun 16, 2012 10:41:13 AM org.apache.catalina.core.AprLifecycleListener init
+INFO: The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: /usr/caimito/jdk/jre/lib/i386/server:/usr/caimito/jdk/jre/lib/i386:/usr/caimito/jdk/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib
+Jun 16, 2012 10:41:14 AM org.apache.coyote.AbstractProtocol init
+INFO: Initializing ProtocolHandler ["http-bio-8619"]
+Jun 16, 2012 10:41:14 AM org.apache.coyote.AbstractProtocol init
+INFO: Initializing ProtocolHandler ["ajp-bio-8659"]
+Jun 16, 2012 10:41:14 AM org.apache.catalina.startup.Catalina load
+INFO: Initialization processed in 1438 ms
+Jun 16, 2012 10:41:14 AM org.apache.catalina.core.StandardService startInternal
+INFO: Starting service Catalina
+Jun 16, 2012 10:41:14 AM org.apache.catalina.core.StandardEngine startInternal
+INFO: Starting Servlet Engine: Apache Tomcat/7.0.27
+Jun 16, 2012 10:41:14 AM org.apache.catalina.startup.HostConfig deployDescriptor
+INFO: Deploying configuration descriptor /usr/caimito/conf/Catalina/localhost/ROOT.xml
+Jun 16, 2012 10:41:17 AM org.apache.coyote.AbstractProtocol start
+INFO: Starting ProtocolHandler ["http-bio-8619"]
+Jun 16, 2012 10:41:17 AM org.apache.coyote.AbstractProtocol start
+INFO: Starting ProtocolHandler ["ajp-bio-8659"]
+Jun 16, 2012 10:41:17 AM org.apache.catalina.startup.Catalina start
+INFO: Server startup in 2805 ms
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol pause
+INFO: Pausing ProtocolHandler ["http-bio-8619"]
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol pause
+INFO: Pausing ProtocolHandler ["ajp-bio-8659"]
+Jun 16, 2012 10:44:20 AM org.apache.catalina.core.StandardService stopInternal
+INFO: Stopping service Catalina
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol stop
+INFO: Stopping ProtocolHandler ["http-bio-8619"]
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol stop
+INFO: Stopping ProtocolHandler ["ajp-bio-8659"]
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol destroy
+INFO: Destroying ProtocolHandler ["http-bio-8619"]
+Jun 16, 2012 10:44:20 AM org.apache.coyote.AbstractProtocol destroy
+INFO: Destroying ProtocolHandler ["ajp-bio-8659"]
No changes.
@@ -0,0 +1,32 @@
+Jun 16, 2012 10:41:22 AM org.apache.catalina.core.StandardWrapperValve invoke
+SEVERE: Servlet.service() for servlet [webdav] in context with path [] threw exception [Error accessing resource] with root cause
+ngasi.caimito.CaimitoException: java.lang.NullPointerException
+ at ngasi.caimito.CaimitoException.throwException(CaimitoException.java:56)
+ at ngasi.caimito.resource.OpenStackResourceObj.auth(OpenStackResourceObj.java:525)
+ at ngasi.caimito.resource.OpenStackResourceObj.doList(OpenStackResourceObj.java:535)
+ at ngasi.caimito.resource.ResourceObj.list(ResourceObj.java:117)
+ at ngasi.caimito.CaimitoDefaultServlet.renderHtml(CaimitoDefaultServlet.java:1543)
+ at ngasi.caimito.CaimitoDefaultServlet.render(CaimitoDefaultServlet.java:1338)
+ at ngasi.caimito.CaimitoDefaultServlet.serveResource(CaimitoDefaultServlet.java:1034)
+ at ngasi.caimito.CaimitoDefaultServlet.doGet(CaimitoDefaultServlet.java:477)
+ at javax.servlet.http.HttpServlet.service(HttpServlet.java:621)
+ at ngasi.caimito.CaimitoWebdavServlet.service(CaimitoWebdavServlet.java:413)
+ at javax.servlet.http.HttpServlet.service(HttpServlet.java:722)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:305)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210)
+ at org.shaft.ShaftFilter.doFilter(ShaftFilter.java:204)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:243)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210)
+ at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:225)
+ at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:169)
+ at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:168)
+ at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:98)
+ at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:927)
+ at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118)
+ at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:407)
+ at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:999)
+ at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:565)
+ at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:307)
+ at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
+ at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
+ at java.lang.Thread.run(Thread.java:662)
@@ -0,0 +1,8 @@
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET / HTTP/1.1" 500 762
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/js/libs/modernizr-2.5.3.min.js HTTP/1.1" 304 -
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/css/style.css HTTP/1.1" 304 -
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/js/plugins.js HTTP/1.1" 304 -
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/js/script.js HTTP/1.1" 304 -
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/logo.png HTTP/1.1" 304 -
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/assets/Molot.woff HTTP/1.1" 404 1196
+127.0.0.1 - - [16/Jun/2012:10:41:22 -0400] "GET /ca/assets/Molot.ttf HTTP/1.1" 404 1196
No changes.
View
@@ -51,13 +51,17 @@
public static boolean cacheable = true;
public static String serverinfo = "Caimito";
public static String CAIMITO_CSS = null;
+<<<<<<< HEAD
public static String version = "0.8";
public static long requestTimeout = 30 * 60 * 1000;
public static int single_cloud_account_with_single_storage = 1;
public static int cloud_accounts_for_administration_only = 2;
public static int cloud_setup=single_cloud_account_with_single_storage;
+=======
+ public static String version = "0.4";
+>>>>>>> 81b81b090d652d7b3c1de4359597c4836eb617da
public static void init()throws CaimitoException{
if (! new File(getConfigFile()).exists())
{
View
No changes.
View
No changes.
View
No changes.
Oops, something went wrong.

0 comments on commit 13ac618

Please sign in to comment.