You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:20:20 UTC

[sling-org-apache-sling-javax-activation] branch master created (now ac7c1e5)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git.


      at ac7c1e5  SLING-7167 Adjust READMEs

This branch includes the following new commits:

     new 299695b  SLING-2835 :  Addition of OSGi-aware javax.activation bundle. Apply contribution from Robert Munteanu
     new a921e17  [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0
     new d33735e  [maven-release-plugin] rollback the release of org.apache.sling.javax.activation-0.1.0
     new a3b1e7b  set svn:ignore and svn info
     new c3c8117  [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0
     new f2b1f47  [maven-release-plugin] prepare for next development iteration
     new e2b687c  Correct reactor pom and update to parent pom 16
     new 728f498  SLING-2887 Properly attribute inclusion of the activation.jar library
     new bf650be  Update to latest parent pom
     new e361feb  Update to parent pom 18
     new 0698d4b  Update to parent pom v19
     new 3711181  Updated to parent version 20
     new 59e6329  Update to Sling Parent POM 22 with baselining enabled
     new 8a61f51  Update to Sling Parent 23
     new 980762a  set parent version to 24 and add empty relativePath where missing
     new 838db3f  Update the main reactor to parent 25
     new 0987765  Switch to parent pom 26
     new ac7c1e5  SLING-7167 Adjust READMEs

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-javax-activation] 06/18: [maven-release-plugin] prepare for next development iteration

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit f2b1f476941aa083de2e0ca52626fc2161788084
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:52:12 2013 +0000

    [maven-release-plugin] prepare for next development iteration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470891 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e56e70b..7cf0f32 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         
     <artifactId>org.apache.sling.javax.activation</artifactId>
     <packaging>bundle</packaging>
-    <version>0.1.0</version>
+    <version>0.1.1-SNAPSHOT</version>
 
     <name>Apache Sling javax.activation bundle</name>
     <description>The Apache Sling javax.activation bundle contributes an OSGi-compatible activation bundle.</description>
@@ -39,9 +39,9 @@
     </properties>    
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.javax.activation-0.1.0</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/javax.activation</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 18/18: SLING-7167 Adjust READMEs

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit ac7c1e5a70cbbb7cc340418e57fe15a3ec1cab6b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:23:18 2017 +0000

    SLING-7167 Adjust READMEs
    
    add missing README
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810700 13f79535-47bb-0310-9956-ffa450edef68
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..afd06fb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling javax.activation bundle
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 11/18: Update to parent pom v19

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 0698d4ba533c6762afdfe7b58c13ab19ae93c17f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000

    Update to parent pom v19
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b96c74..eb30793 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>18</version>
+        <version>19</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 10/18: Update to parent pom 18

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit e361feb8b8cf4570b98b915678b646281ebab874
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000

    Update to parent pom 18
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8616ebc..2b96c74 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>17</version>
+        <version>18</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 13/18: Update to Sling Parent POM 22 with baselining enabled

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 59e63293887198e94f633b332e006901ed19b412
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000

    Update to Sling Parent POM 22 with baselining enabled
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2352dfa..c2b0646 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>20</version>
+        <version>22</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 05/18: [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit c3c8117540c0f37289c022a7e7e4e60fd392a001
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:51:49 2013 +0000

    [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470888 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6503c69..e56e70b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         
     <artifactId>org.apache.sling.javax.activation</artifactId>
     <packaging>bundle</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0</version>
 
     <name>Apache Sling javax.activation bundle</name>
     <description>The Apache Sling javax.activation bundle contributes an OSGi-compatible activation bundle.</description>
@@ -39,9 +39,9 @@
     </properties>    
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/javax.activation</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.javax.activation-0.1.0</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 04/18: set svn:ignore and svn info

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit a3b1e7b3011c48f45de0d36421596ac190936174
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:50:47 2013 +0000

    set svn:ignore and svn info
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470887 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 988cf05..6503c69 100755
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,12 @@
         <site.javadoc.exclude>**.impl.**</site.javadoc.exclude>
     </properties>    
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/javax.activation</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/javax.activation</url>
+    </scm>
+
     <build>
         <plugins>
             <plugin>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 14/18: Update to Sling Parent 23

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 8a61f51370a36658b53e4d6e252aed84ac954fb1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000

    Update to Sling Parent 23
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c2b0646..b358b77 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>22</version>
+        <version>23</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 15/18: set parent version to 24 and add empty relativePath where missing

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 980762a1af94ce52263a2b083b214b6fe7fb2e38
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000

    set parent version to 24 and add empty relativePath where missing
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b358b77..118a172 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,8 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>23</version>
+        <version>24</version>
+        <relativePath/>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 07/18: Correct reactor pom and update to parent pom 16

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit e2b687c367f80136463506df4c8370c630a954fc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000

    Correct reactor pom and update to parent pom 16
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7cf0f32..46f4a67 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>15</version>
+        <version>16</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 03/18: [maven-release-plugin] rollback the release of org.apache.sling.javax.activation-0.1.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit d33735e4482c3dea807c553b6d814168ec509b94
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:46:54 2013 +0000

    [maven-release-plugin] rollback the release of org.apache.sling.javax.activation-0.1.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470885 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78ce102..988cf05 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         
     <artifactId>org.apache.sling.javax.activation</artifactId>
     <packaging>bundle</packaging>
-    <version>0.1.0</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <name>Apache Sling javax.activation bundle</name>
     <description>The Apache Sling javax.activation bundle contributes an OSGi-compatible activation bundle.</description>
@@ -85,10 +85,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</developerConnection>
-    <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.javax.activation-0.1.0</url>
-  </scm>
 </project>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 16/18: Update the main reactor to parent 25

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 838db3ff7ad43868e761192143efe49ecca8ddc2
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000

    Update the main reactor to parent 25
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 118a172..83929dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>24</version>
+        <version>25</version>
         <relativePath/>
     </parent>
         

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 01/18: SLING-2835 : Addition of OSGi-aware javax.activation bundle. Apply contribution from Robert Munteanu

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 299695b75d3c3fcf9a755140aaf0683231d24a6c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:41:40 2013 +0000

    SLING-2835 :  Addition of OSGi-aware javax.activation bundle. Apply contribution from Robert Munteanu
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470883 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            |  88 +++++++
 .../sling/javax/activation/internal/Activator.java | 130 ++++++++++
 .../activation/internal/OsgiMailcapCommandMap.java | 279 +++++++++++++++++++++
 3 files changed, 497 insertions(+)

diff --git a/pom.xml b/pom.xml
new file mode 100755
index 0000000..988cf05
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>15</version>
+    </parent>
+        
+    <artifactId>org.apache.sling.javax.activation</artifactId>
+    <packaging>bundle</packaging>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <name>Apache Sling javax.activation bundle</name>
+    <description>The Apache Sling javax.activation bundle contributes an OSGi-compatible activation bundle.</description>
+    
+    <properties>
+        <javax.activation.version>1.1.1</javax.activation.version>
+        <site.javadoc.exclude>**.impl.**</site.javadoc.exclude>
+    </properties>    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Activator>org.apache.sling.javax.activation.internal.Activator</Bundle-Activator>
+                        <Export-Package>javax.activation;version=${javax.activation.version}</Export-Package>
+                        <Embed-Dependency>*;scope=compile</Embed-Dependency>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>${javax.activation.version}</version>
+        </dependency>
+        <!-- Compendium 4.2.0 is needed to access BundleTracker -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>4.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/javax/activation/internal/Activator.java b/src/main/java/org/apache/sling/javax/activation/internal/Activator.java
new file mode 100755
index 0000000..626613a
--- /dev/null
+++ b/src/main/java/org/apache/sling/javax/activation/internal/Activator.java
@@ -0,0 +1,130 @@
+/*
+ * 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.sling.javax.activation.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.activation.CommandMap;
+import javax.activation.MailcapCommandMap;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.util.tracker.BundleTracker;
+import org.osgi.util.tracker.BundleTrackerCustomizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The <tt>Activator</tt> locates <tt>activation</tt>-related services defined in <tt>mailcap</tt> files and registers
+ * them so they can be used by the Java Activation Framework
+ * 
+ * <p>
+ * The mailcap entries are expected to be found in a <tt>/META-INF/mailcap</tt> file inside the bundle.
+ * </p>
+ * 
+ * <p>
+ * This implementation does not support the full lookup algorithm specified by the {@link MailcapCommandMap}.
+ * </p>
+ * 
+ */
+public class Activator implements BundleActivator {
+
+    private static final String MAILCAP_FILE_NAME = "/META-INF/mailcap";
+    private static final Logger log = LoggerFactory.getLogger(Activator.class);
+
+    private BundleTracker bundleTracker;
+    private OsgiMailcapCommandMap commandMap;
+
+    public void start(BundleContext context) throws Exception {
+
+        commandMap = new OsgiMailcapCommandMap();
+
+        for (Bundle bundle : context.getBundles())
+            registerBundleMailcapEntries(bundle);
+
+        CommandMap.setDefaultCommandMap(commandMap);
+
+        bundleTracker = new BundleTracker(context, Bundle.ACTIVE | Bundle.UNINSTALLED | Bundle.STOP_TRANSIENT,
+                new BundleTrackerCustomizer() {
+
+                    public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
+                        unregisterBundleMailcapEntries(bundle);
+                    }
+
+                    public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
+                        unregisterBundleMailcapEntries(bundle);
+                        registerBundleMailcapEntries(bundle);
+                    }
+
+                    public Object addingBundle(Bundle bundle, BundleEvent event) {
+                        registerBundleMailcapEntries(bundle);
+                        return bundle;
+                    }
+                });
+
+        bundleTracker.open();
+    }
+
+    private void registerBundleMailcapEntries(Bundle bundle) {
+
+        if (bundle.getState() != Bundle.ACTIVE)
+            return;
+
+        URL mailcapEntry = bundle.getEntry(MAILCAP_FILE_NAME);
+        if (mailcapEntry == null)
+            return;
+
+        InputStream input = null;
+
+        try {
+            input = mailcapEntry.openStream();
+
+            commandMap.addMailcapEntries(input, bundle);
+
+        } catch (IOException e) {
+            log.warn("Failed loading " + MAILCAP_FILE_NAME + " from bundle " + bundle, e);
+        } finally {
+            try {
+                input.close();
+            } catch (IOException e) {
+                // don't care
+            }
+        }
+    }
+
+    private void unregisterBundleMailcapEntries(Bundle bundle) {
+
+        commandMap.removeMailcapEntriesForBundle(bundle);
+    }
+
+    public void stop(BundleContext context) throws Exception {
+
+        if (bundleTracker != null) {
+            bundleTracker.close();
+            bundleTracker = null;
+        }
+
+        CommandMap.setDefaultCommandMap(null);
+    }
+
+}
diff --git a/src/main/java/org/apache/sling/javax/activation/internal/OsgiMailcapCommandMap.java b/src/main/java/org/apache/sling/javax/activation/internal/OsgiMailcapCommandMap.java
new file mode 100755
index 0000000..e8ff2b9
--- /dev/null
+++ b/src/main/java/org/apache/sling/javax/activation/internal/OsgiMailcapCommandMap.java
@@ -0,0 +1,279 @@
+/*
+ * 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.sling.javax.activation.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.activation.CommandInfo;
+import javax.activation.CommandMap;
+import javax.activation.DataContentHandler;
+
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.sun.activation.registries.MailcapFile;
+
+/**
+ * The <tt>OsgiMailcapCommandMap</tt> is a <tt>CommandMap</tt> which ensures that {@link DataCommandHandler} classes are
+ * loaded by their containing bundles.
+ * 
+ * <p>
+ * This allows the javax.activation bundle to obey classloading contraints in an OSGi environment, while preserving most
+ * of the functionality available in an unmodified version of the bundle. Notably, this implementation does not support
+ * loading <tt>mailcap</tt> files which are not placed inside a bundle.
+ * </p>
+ * 
+ */
+public class OsgiMailcapCommandMap extends CommandMap {
+
+    private static final Logger log = LoggerFactory.getLogger(OsgiMailcapCommandMap.class);
+
+    private final Map<Bundle, MailcapFile> db = new HashMap<Bundle, MailcapFile>();
+    private final Object sync = new Object();
+
+    public void addMailcapEntries(InputStream mailcapFile, Bundle originatingBundle) throws IOException {
+
+        synchronized (sync) {
+            db.put(originatingBundle, new MailcapFile(mailcapFile));
+        }
+
+        log.debug("Added mailcap entries from bundle {}", originatingBundle);
+    }
+
+    public void removeMailcapEntriesForBundle(Bundle bundle) {
+
+        boolean removed;
+        synchronized (sync) {
+            removed = db.remove(bundle) != null;
+        }
+
+        if (removed) {
+            log.debug("Removed mailcap entries from bundle {}", bundle);
+        }
+    }
+
+    @Override
+    public CommandInfo[] getPreferredCommands(String mimeType) {
+
+        List<CommandInfo> commands = new ArrayList<CommandInfo>();
+
+        if (mimeType != null) {
+            mimeType = mimeType.toLowerCase(Locale.ENGLISH);
+        }
+
+        synchronized (sync) {
+            getPreferredCommands(mimeType, commands, false);
+            getPreferredCommands(mimeType, commands, true);
+        }
+
+        return commands.toArray(new CommandInfo[commands.size()]);
+    }
+
+    private void getPreferredCommands(String mimeType, List<CommandInfo> accumulator, boolean fallback) {
+
+        for (Map.Entry<Bundle, MailcapFile> entry : db.entrySet()) {
+            Map<?, ?> commandMap = fallback ? entry.getValue().getMailcapFallbackList(mimeType) : entry.getValue()
+                    .getMailcapList(mimeType);
+
+            if (commandMap == null) {
+                continue;
+            }
+
+            for (Object verbObject : commandMap.keySet()) {
+                String verb = (String) verbObject;
+
+                if (!commandsHaveVerb(accumulator, verb)) {
+                    List<?> commands = (List<?>) commandMap.get(verb);
+                    String className = (String) commands.get(0);
+                    accumulator.add(new CommandInfo(verb, className));
+                }
+            }
+        }
+    }
+
+    @Override
+    public CommandInfo[] getAllCommands(String mimeType) {
+        List<CommandInfo> commands = new ArrayList<CommandInfo>();
+        if (mimeType != null) {
+            mimeType = mimeType.toLowerCase(Locale.ENGLISH);
+        }
+
+        synchronized (sync) {
+            getAllCommands(mimeType, commands, false);
+            getAllCommands(mimeType, commands, true);
+        }
+
+        return commands.toArray(new CommandInfo[commands.size()]);
+    }
+
+    private void getAllCommands(String mimeType, List<CommandInfo> accumulator, boolean fallback) {
+        for (Map.Entry<Bundle, MailcapFile> entry : db.entrySet()) {
+            Map<?, ?> commandMap = fallback ? entry.getValue().getMailcapFallbackList(mimeType) : 
+                entry.getValue() .getMailcapList(mimeType);
+
+            if (commandMap == null) {
+                continue;
+            }
+
+            for (Object verbAsObject : commandMap.keySet()) {
+                String verb = (String) verbAsObject;
+
+                List<?> commands = (List<?>) commandMap.get(verb);
+            
+                for (Object command : commands) {
+                    accumulator.add(new CommandInfo(verb, (String) command));
+                }
+
+            }
+        }
+    }
+
+    @Override
+    public CommandInfo getCommand(String mimeType, String cmdName) {
+        if (mimeType != null) {
+            mimeType = mimeType.toLowerCase(Locale.ENGLISH);
+        }
+
+        CommandInfo command = null;
+
+        synchronized (sync) {
+            command = getCommand(mimeType, cmdName, false);
+            if (command != null) {
+                return command;
+            }
+
+            command = getCommand(mimeType, cmdName, true);
+        }
+
+        return command;
+    }
+    
+    private CommandInfo getCommand(String mimeType, String commandName, boolean fallback) {
+        
+        for (Map.Entry<Bundle, MailcapFile> entry : db.entrySet()) {
+            Map<?, ?> commandMap = fallback ? entry.getValue().getMailcapFallbackList(mimeType)
+                    : entry.getValue().getMailcapList(mimeType);
+            if (commandMap != null) {
+                List<?> commands = (List<?>) commandMap.get(commandName);
+                if (commands == null) {
+                    continue;
+                }
+
+                String cmdClassName = (String) commands.get(0);
+
+                if (cmdClassName != null) {
+                    return new CommandInfo(commandName, cmdClassName);
+                }
+            }
+        }
+        
+        return null;
+    }
+
+    @Override
+    public DataContentHandler createDataContentHandler(String mimeType) {
+        if (mimeType != null) {
+            mimeType = mimeType.toLowerCase(Locale.ENGLISH);
+        }
+
+        synchronized (sync) {
+            DataContentHandler dch = findDataContentHandler(mimeType, false);
+
+            if (dch != null) {
+                return dch;
+            }
+
+            return findDataContentHandler(mimeType, true);
+        }
+    }
+
+    private DataContentHandler findDataContentHandler(String mimeType, boolean fallback) {
+
+        for (Map.Entry<Bundle, MailcapFile> entry : db.entrySet()) {
+            Map<?, ?> commandMap = fallback ? entry.getValue().getMailcapFallbackList(mimeType) : entry.getValue()
+                    .getMailcapList(mimeType);
+            if (commandMap != null) {
+                List<?> v = (List<?>) commandMap.get("content-handler");
+                if (v == null) {
+                    continue;
+                }
+
+                String name = (String) v.get(0);
+                DataContentHandler dch = getDataContentHandler(name, entry.getKey());
+                if (dch != null) {
+                    return dch;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public String[] getMimeTypes() {
+        List<String> mimeTypesList = new ArrayList<String>();
+
+        synchronized (sync) {
+            for (Map.Entry<Bundle, MailcapFile> entry : db.entrySet()) {
+                String[] mimeTypes = entry.getValue().getMimeTypes();
+                for (String mimeType : mimeTypes) {
+                    if (!mimeTypesList.contains(mimeType)) {
+                        mimeTypesList.add(mimeType);
+                    }
+                }
+            }
+        }
+
+        return mimeTypesList.toArray(new String[mimeTypesList.size()]);
+    }
+
+    private DataContentHandler getDataContentHandler(String name, Bundle bundle) {
+        try {
+            return (DataContentHandler) bundle.loadClass(name).newInstance();
+        } catch (InstantiationException e) {
+            log.warn("Unable to instantiate " + DataContentHandler.class.getSimpleName() + " class ' " + name
+                    + " ' from bundle " + bundle, e);
+        } catch (IllegalAccessException e) {
+            log.warn("Unable to instantiate " + DataContentHandler.class.getSimpleName() + " class ' " + name
+                    + " ' from bundle " + bundle, e);
+        } catch (ClassNotFoundException e) {
+            log.warn("Unable to instantiate " + DataContentHandler.class.getSimpleName() + " class ' " + name
+                    + " ' from bundle " + bundle, e);
+        }
+
+        return null;
+    }
+
+    private boolean commandsHaveVerb(List<CommandInfo> commands, String verb) {
+
+        for (CommandInfo commandInfo : commands) {
+            if (commandInfo.getCommandName().equals(verb)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 12/18: Updated to parent version 20

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 371118103f74dac56fcc22b28d1f966d4bbb225c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000

    Updated to parent version 20
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb30793..2352dfa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>19</version>
+        <version>20</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 08/18: SLING-2887 Properly attribute inclusion of the activation.jar library

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 728f4986ea4a7a5c71f4117f376a67f02cf13617
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Tue May 28 10:30:55 2013 +0000

    SLING-2887 Properly attribute inclusion of the activation.jar library
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1486856 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/appended-resources/META-INF/LICENSE | 136 +++++++++++++++++++++++++++
 src/main/appended-resources/META-INF/NOTICE  |   4 +
 2 files changed, 140 insertions(+)

diff --git a/src/main/appended-resources/META-INF/LICENSE b/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..db655ca
--- /dev/null
+++ b/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,136 @@
+
+
+APACHE SLING JAVAX.ACTIVATION SUBCOMPONENTS: 
+
+The Apache Sling javax.activation includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+
+For the Activation library component:
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+   1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
+
+   1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+   1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+   1.4. Executable. means the Covered Software in any form other than Source Code.
+
+   1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
+
+   1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+   1.7. License. means this document.
+
+   1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+   1.9. Modifications. means the Source Code and Executable form of any of the following:
+
+        A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+        B. Any new file that contains any part of the Original Software or previous Modification; or
+
+        C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+   1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
+
+   1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+   1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+   1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outs [...]
+
+2. License Grants.
+
+      2.1. The Initial Developer Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+         (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+
+         (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+
+        (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+
+        (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+
+    2.2. Contributor Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+        (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+
+        (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+
+        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+
+        (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that [...]
+
+3. Distribution Obligations.
+
+      3.1. Availability of Source Code.
+      Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Soft [...]
+
+      3.2. Modifications.
+      The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+      3.3. Required Notices.
+      You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+      3.4. Application of Additional Terms.
+      You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that an [...]
+
+      3.5. Distribution of Executable Versions.
+      You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable  [...]
+
+      3.6. Larger Works.
+      You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+      4.1. New Versions.
+      Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+      4.2. Effect of New Versions.
+      You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under [...]
+
+      4.3. Modified Versions.
+      When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+   COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME  [...]
+
+6. TERMINATION.
+
+      6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+      6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rig [...]
+
+      6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND AL [...]
+
+8. U.S. GOVERNMENT END USERS.
+
+   The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth [...]
+
+9. MISCELLANEOUS.
+
+   This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigati [...]
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+   As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+   NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+   The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
diff --git a/src/main/appended-resources/META-INF/NOTICE b/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..ffabdaf
--- /dev/null
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,4 @@
+
+This product includes software developed at
+Sun Microsystems
+licensed under CDDL 1.0

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 02/18: [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit a921e17c2c8515ea0cbe62de24b3cf5c4b0f2184
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Apr 23 10:46:19 2013 +0000

    [maven-release-plugin] prepare release org.apache.sling.javax.activation-0.1.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1470884 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 988cf05..78ce102 100755
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         
     <artifactId>org.apache.sling.javax.activation</artifactId>
     <packaging>bundle</packaging>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0</version>
 
     <name>Apache Sling javax.activation bundle</name>
     <description>The Apache Sling javax.activation bundle contributes an OSGi-compatible activation bundle.</description>
@@ -85,4 +85,10 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.javax.activation-0.1.0</developerConnection>
+    <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.javax.activation-0.1.0</url>
+  </scm>
 </project>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 09/18: Update to latest parent pom

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit bf650beda6d193bd0b1b306096131b47e0d274b0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000

    Update to latest parent pom
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 46f4a67..8616ebc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>16</version>
+        <version>17</version>
     </parent>
         
     <artifactId>org.apache.sling.javax.activation</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-javax-activation] 17/18: Switch to parent pom 26

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git

commit 0987765da62aa67153d52e29766d0c772ecd04fe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000

    Switch to parent pom 26
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 83929dc..a602f38 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>25</version>
+        <version>26</version>
         <relativePath/>
     </parent>
         

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.