manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1379843 - in /manifoldcf/trunk/framework: ./ api-service/src/main/webapp/WEB-INF/ api-servlet/src/main/java/org/apache/manifoldcf/api/ authority-service/src/main/webapp/WEB-INF/ authority-servlet/src/main/java/org/apache/manifoldcf/authori...
Date Sat, 01 Sep 2012 20:48:03 GMT
Author: kwright
Date: Sat Sep  1 20:48:03 2012
New Revision: 1379843

URL: http://svn.apache.org/viewvc?rev=1379843&view=rev
Log:
More fixes related to CONNECTORS-514; fix for CONNECTORS-515

Added:
    manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
  (with props)
    manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
  (with props)
    manifoldcf/trunk/framework/crawler-ui/src/main/java/
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
  (with props)
Removed:
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ServletListener.java
Modified:
    manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml
    manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml

Modified: manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml?rev=1379843&r1=1379842&r2=1379843&view=diff
==============================================================================
--- manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/api-service/src/main/webapp/WEB-INF/web.xml Sat Sep  1 20:48:03
2012
@@ -40,7 +40,7 @@
   </session-config>
 
   <listener>
-    <listener-class>org.apache.manifoldcf.core.system.ServletListener</listener-class>
+    <listener-class>org.apache.manifoldcf.api.ServletListener</listener-class>
   </listener>
 
 </web-app>

Added: manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java?rev=1379843&view=auto
==============================================================================
--- manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
(added)
+++ manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
Sat Sep  1 20:48:03 2012
@@ -0,0 +1,49 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.api;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
+import javax.servlet.*;
+
+/** This class furnishes a servlet shutdown hook for ManifoldCF.  It should be referenced
in the
+* web.xml file for the application in order to do the right thing, however.
+*/
+public class ServletListener implements ServletContextListener
+{
+  public static final String _rcsid = "@(#)$Id$";
+
+  public void contextInitialized(ServletContextEvent sce)
+  {
+    try
+    {
+      ManifoldCF.initializeEnvironment();
+    }
+    catch (ManifoldCFException e)
+    {
+      throw new RuntimeException("Could not initialize servlet; "+e.getMessage(),e);
+    }
+  }
+  
+  public void contextDestroyed(ServletContextEvent sce)
+  {
+    ManifoldCF.cleanUpEnvironment();
+  }
+
+}

Propchange: manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml?rev=1379843&r1=1379842&r2=1379843&view=diff
==============================================================================
--- manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/authority-service/src/main/webapp/WEB-INF/web.xml Sat Sep 
1 20:48:03 2012
@@ -40,7 +40,7 @@
   </session-config>
 
   <listener>
-    <listener-class>org.apache.manifoldcf.core.system.ServletListener</listener-class>
+    <listener-class>org.apache.manifoldcf.authorityservice.ServletListener</listener-class>
   </listener>
 
 </web-app>

Added: manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java?rev=1379843&view=auto
==============================================================================
--- manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
(added)
+++ manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
Sat Sep  1 20:48:03 2012
@@ -0,0 +1,49 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.authorityservice;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.authorities.system.ManifoldCF;
+import javax.servlet.*;
+
+/** This class furnishes a servlet shutdown hook for ManifoldCF.  It should be referenced
in the
+* web.xml file for the application in order to do the right thing, however.
+*/
+public class ServletListener implements ServletContextListener
+{
+  public static final String _rcsid = "@(#)$Id$";
+
+  public void contextInitialized(ServletContextEvent sce)
+  {
+    try
+    {
+      ManifoldCF.initializeEnvironment();
+    }
+    catch (ManifoldCFException e)
+    {
+      throw new RuntimeException("Could not initialize servlet; "+e.getMessage(),e);
+    }
+  }
+  
+  public void contextDestroyed(ServletContextEvent sce)
+  {
+    ManifoldCF.cleanUpEnvironment();
+  }
+
+}

Propchange: manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1379843&r1=1379842&r2=1379843&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat Sep  1 20:48:03 2012
@@ -174,6 +174,17 @@
     </target>
 
     <target name="compile-crawler-ui" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
+        <mkdir dir="build/crawler-ui/classes"/>
+        <javac srcdir="crawler-ui/src/main/java" destdir="build/crawler-ui/classes" target="1.6"
source="1.6" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/ui-core/classes"/>
+                <pathelement location="build/agents/classes"/>
+                <pathelement location="build/pull-agent/classes"/>
+            </classpath>
+        </javac>
+
         <!-- Define the jsp compilation task using tomcat libraries -->
         <taskdef classname="org.apache.jasper.JspC" name="jasper2" > 
             <classpath id="jspc.classpath"> 
@@ -434,6 +445,7 @@
         <copy todir="build/webapp/crawler-ui">
             <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
         </copy>
+        <jar destfile="build/webapp/crawler-ui/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
     </target>
   
       <target name="webapp-crawler-ui-proprietary" depends="compile-crawler-ui,jar-core,jar-ui-core,jar-agents,jar-pull-agent">
@@ -485,6 +497,7 @@
         <copy todir="build/webapp/crawler-ui-proprietary">
             <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
         </copy>
+        <jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar"
basedir="build/crawler-ui/classes"/>
     </target>
 
     <target name="war-authority-service" depends="webapp-authority-service">

Added: manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java?rev=1379843&view=auto
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
(added)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
Sat Sep  1 20:48:03 2012
@@ -0,0 +1,49 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.crawlerui;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
+import javax.servlet.*;
+
+/** This class furnishes a servlet shutdown hook for ManifoldCF.  It should be referenced
in the
+* web.xml file for the application in order to do the right thing, however.
+*/
+public class ServletListener implements ServletContextListener
+{
+  public static final String _rcsid = "@(#)$Id$";
+
+  public void contextInitialized(ServletContextEvent sce)
+  {
+    try
+    {
+      ManifoldCF.initializeEnvironment();
+    }
+    catch (ManifoldCFException e)
+    {
+      throw new RuntimeException("Could not initialize servlet; "+e.getMessage(),e);
+    }
+  }
+  
+  public void contextDestroyed(ServletContextEvent sce)
+  {
+    ManifoldCF.cleanUpEnvironment();
+  }
+
+}

Propchange: manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/ServletListener.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml?rev=1379843&r1=1379842&r2=1379843&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/WEB-INF/web.xml Sat Sep  1 20:48:03
2012
@@ -57,7 +57,7 @@
   </context-param>
 
   <listener>
-    <listener-class>org.apache.manifoldcf.core.system.ServletListener</listener-class>
+    <listener-class>org.apache.manifoldcf.crawlerui.ServletListener</listener-class>
   </listener>
 
 </web-app>



Mime
View raw message