You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/08/28 20:02:32 UTC
svn commit: r1162566 - in
/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi: ./
org.apache.maven.doxia.eclipse.dependencies/ p2-repository/
p2-repository/feature/ p2-repository/p2/ src/ src/site/ src/site/apt/
Author: bimargulies
Date: Sun Aug 28 18:02:31 2011
New Revision: 1162566
URL: http://svn.apache.org/viewvc?rev=1162566&view=rev
Log:
An attempt to cook up a bundle in a repo.
Added:
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt (with props)
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/site.xml
- copied, changed from r1162393, maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/site.xml
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>doxia-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>dependencies</artifactId>
+ <packaging>bundle</packaging>
+ <name>Doxia Tools :: Eclipse IDE - Dependencies as Bundle</name>
+ <description>Make an OSGi bundle of the required non-OSGi components</description>
+ <prerequisites>
+ <maven>3.0.3</maven>
+ </prerequisites>
+ <properties>
+ <doxiaVersion>1.2</doxiaVersion>
+ <doxiaConverterVersion>1.2</doxiaConverterVersion>
+ <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version>
+ </properties>
+ <dependencies>
+ <!-- Doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-converter</artifactId>
+ <version>${doxiaConverterVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-logging-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-confluence</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-docbook-simple</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fml</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-fo</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-itext</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-latex</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-rtf</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-twiki</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xdoc</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency>
+ <Export-Package>
+ org.apache.maven.doxia.*;-split-package:=merge-first,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output
+ </Export-Package>
+ <Import-Package>!com.apple.mrj,!com.sun.*,!javax.*,!org.apache.commons.*,!org.apache.log,!org.apache.xmlbeans,!org.apache.tools.*,!org.apache.xml.*,!org.codehaus.*,!sun.*,*</Import-Package>
+ <Embed-Transitive>true</Embed-Transitive>
+ <_nouses>true</_nouses>
+ <_nodefaultversion>true</_nodefaultversion>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ <additionalBuildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ </additionalBuildcommands>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </additionalProjectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <lifecycleMappings>
+ <lifecycleMapping>
+ <packagingType>bundle</packagingType>
+ <lifecycleMappingId>org.sonatype.tycho.m2e.wrapperBundle</lifecycleMappingId>
+ </lifecycleMapping>
+ </lifecycleMappings>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>${maven-bundle-plugin-version}</versionRange>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <configurator>
+ <id>org.sonatype.tycho.m2e.wrapperBundle</id>
+ </configurator>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>${maven-bundle-plugin-version}</versionRange>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin-version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <finalName>org.apache.maven.doxia.eclipse.dependencies_${project.version}</finalName>
+ </build>
+</project>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties Sun Aug 28 18:02:31 2011
@@ -0,0 +1 @@
+bin.includes = feature.xml
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/build.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.apache.maven.doxia.ide.dependencies.temp.feature"
+ label="Doxia IDE dependencies"
+ version="1.0.0.qualifier"
+ provider-name="Apache Software Foundation">
+
+ <description>Dummy feature to make a P2 containing the dependencies</description>
+
+ <plugin
+ id="org.apache.maven.doxia.ide.dependencies"
+ download-size="0"
+ install-size="0"
+ version="1.0.0"
+ unpack="false"/>
+</feature>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/feature.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.apache.maven.doxia.ide.dependencies.temp.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+ <name>Doxia Tools :: Eclipse IDE - Feature containing dependency bundle</name>
+ <description>Put the bundle with the dependencies into feature</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>dependencies</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/feature/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,7 @@
+<site>
+ <category-def name="org.apache.maven.doxia.dummy.category" label="Doxia Dummy Category"/>
+ <feature url="features/org.apache.maven.doxia.ide.dependencies.temp.feature_1.0.0.qualifier.jar"
+ id="org.apache.maven.doxia.ide.dependencies.temp.feature" version="1.0.0.qualifier">
+ <category name="org.apache.maven.doxia.dummy.category"/>
+ </feature>
+</site>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/category.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>p2</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <name>Doxia Tools :: Eclipse IDE - P2 Repository containing dependency bundle</name>
+ <description>Put the bundle with the dependencies into a P2 repository</description>
+</project>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/p2/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>doxia-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>p2-repository</artifactId>
+ <packaging>pom</packaging>
+ <name>Doxia Tools :: Eclipse IDE - P2 Feature and Repository containing dependency bundle</name>
+ <description>Put the bundle with the dependencies into a feature and a P2 repository</description>
+ <prerequisites>
+ <maven>3.0.3</maven>
+ </prerequisites>
+ <properties>
+ <tycho-version>0.12.0</tycho-version>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>feature</module>
+ <module>p2</module>
+ </modules>
+</project>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/p2-repository/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml Sun Aug 28 18:02:31 2011
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>3.0.3</maven>
+ </prerequisites>
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ <relativePath/>
+ </parent>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>doxia-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <description>Make an OSGi bundle consisting of Doxia, and put it in a P2 repo.</description>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi</url>
+ </scm>
+<!-- DO NOT USE THIS POM. Tycho won't resolve through the reactor for the bundle.
+ Set up the invoker at some point -->
+</project>
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt?rev=1162566&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt Sun Aug 28 18:02:31 2011
@@ -0,0 +1,29 @@
+ -----
+ Doxia Components as an OSGi plugin
+ -----
+ Benson Margulies
+ -----
+ 26 August 2011
+ -----
+
+ To have eclipse plugins that use the insides of Doxia, we need at least one
+ OSGi bundle containing Doxia itself. This could be arranged by adding OSGi
+ manifest metadata to them one-at-a-time, but I doubt that anyone has much
+ enthusiasm for that.
+
+ The initial attempt at this using the maven-bundle-plugin was relatively simple.
+ By using Embed-Dependencies and _exportcontents, you can instruct it to
+ grab all the maven dependencies of the current project as jars embedded in the
+ bundle jar, and set up the manifest to match.
+
+ Unfortunately, both the maven-eclipse-plugin and M2E are poorly behaved
+ in the face of this. m-e-p responds by trying to edit the MANIFEST.MF of
+ a project that uses it. M2E, according to Igor, 'does not support
+ Embed-Dependencies'. Since some of us are not big M2E fans, I'm structuring
+ this in a way which should be palatable to both.
+
+ That requires giving up on Tycho's ability to work with a dependent bundle
+ called out as a Maven dependency. Instead, this project builds an OSGi
+ bundle which is, essentially, 'shaded', and then sticks it into a P2 repository
+ hiding in the local repository. Then the Tycho build of the editor plugins
+ searches that repository.
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/site.xml (from r1162393, maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/site.xml)
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/site.xml?p2=maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/site.xml&p1=maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/site.xml&r1=1162393&r2=1162566&rev=1162566&view=diff
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/src/site/site.xml (original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/src/site/site.xml Sun Aug 28 18:02:31 2011
@@ -21,7 +21,7 @@
*/
-->
-<project name="Doxia Eclipse Editors"
+<project name="Doxia OSGi"
xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">