svn commit: r1327939 - in /tika/trunk/tika-parsers: pom.xml src/main/java/org/apache/tika/parser/internal/Activator.java src/main/java/org/apache/tika/parser/internal/OSGiDetector.java src/main/java/org/apache/tika/parser/internal/OSGiParser.java

[ju...@apache.org]

Author: jukka
Date: Thu Apr 19 13:04:19 2012
New Revision: 1327939

URL: http://svn.apache.org/viewvc?rev=1327939&view=rev
Log:
TIKA-896: OSGi deployment without declarative services

Add missing Activator. Inline the separate OSGiDetector and -Parser classes.

Added:
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java   (with props)
Removed:
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/OSGiDetector.java
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/OSGiParser.java
Modified:
    tika/trunk/tika-parsers/pom.xml

Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1327939&r1=1327938&r2=1327939&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Thu Apr 19 13:04:19 2012
@@ -211,7 +211,7 @@
           <instructions>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
             <Bundle-Activator>
-              org.apache.tika.parser.internal.TikaActivator
+              org.apache.tika.parser.internal.Activator
             </Bundle-Activator>
             <Import-Package>
                 org.w3c.dom,

Added: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java?rev=1327939&view=auto
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java (added)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java Thu Apr 19 13:04:19 2012
@@ -0,0 +1,51 @@
+/*
+ * 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.tika.parser.internal;
+
+import java.util.Properties;
+
+import org.apache.tika.detect.DefaultDetector;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.parser.DefaultParser;
+import org.apache.tika.parser.Parser;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator implements BundleActivator {
+
+    private ServiceRegistration detectorService;
+
+    private ServiceRegistration parserService;
+
+    public void start(BundleContext context) throws Exception {
+        detectorService = context.registerService(
+                Detector.class.getName(),
+                new DefaultDetector(Activator.class.getClassLoader()),
+                new Properties());
+        parserService = context.registerService(
+                Parser.class.getName(),
+                new DefaultParser(Activator.class.getClassLoader()),
+                new Properties());
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        parserService.unregister();
+        detectorService.unregister();
+    }
+
+}

Propchange: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/internal/Activator.java
------------------------------------------------------------------------------
    svn:eol-style = native