Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make BatooJPA OSGi friendly (cleanup) #175
- Loading branch information
1 parent
0f015d1
commit 3acf9c1
Showing
4 changed files
with
497 additions
and
566 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,61 @@ | ||
| <!-- | ||
| Copyright (c) 2012 - Batoo Software ve Consultancy Ltd. | ||
| Copyright (c) 2012 - Batoo Software ve Consultancy Ltd. | ||
| This copyrighted material is made available to anyone wishing to use, modify, | ||
| copy, or redistribute it subject to the terms and conditions of the GNU | ||
| Lesser General Public License, as published by the Free Software Foundation. | ||
| This copyrighted material is made available to anyone wishing to use, modify, | ||
| copy, or redistribute it subject to the terms and conditions of the GNU | ||
| Lesser General Public License, as published by the Free Software Foundation. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| for more details. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| for more details. | ||
| You should have received a copy of the GNU Lesser General Public License | ||
| along with this distribution; if not, write to: | ||
| Free Software Foundation, Inc. | ||
| 51 Franklin Street, Fifth Floor | ||
| Boston, MA 02110-1301 USA | ||
| You should have received a copy of the GNU Lesser General Public License | ||
| along with this distribution; if not, write to: | ||
| Free Software Foundation, Inc. | ||
| 51 Franklin Street, Fifth Floor | ||
| Boston, MA 02110-1301 USA | ||
| --> | ||
| <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> | ||
| <artifactId>parent</artifactId> | ||
| <groupId>org.batoo.jpa</groupId> | ||
| <version>2.0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <packaging>bundle</packaging> | ||
|
|
||
| <artifactId>batoo-annotations</artifactId> | ||
| <name>Batoo Persistence Annotations</name> | ||
|
|
||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/java</directory> | ||
| <excludes> | ||
| <exclude>**/*.java</exclude> | ||
| </excludes> | ||
| </testResource> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/resources</directory> | ||
| </testResource> | ||
| </testResources> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>2.2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar-no-fork</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Bundle-Version>${project.version}</Bundle-Version> | ||
| <Export-Package> | ||
| org.batoo.jpa.* | ||
| </Export-Package> | ||
| <Import-Package> | ||
| com.jolbox.bonecp;resolution:=optional, | ||
| * | ||
| </Import-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| </project> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>parent</artifactId> | ||
| <groupId>org.batoo.jpa</groupId> | ||
| <version>2.0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>batoo-annotations</artifactId> | ||
| <name>Batoo Persistence Annotations</name> | ||
|
|
||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/java</directory> | ||
| <excludes> | ||
| <exclude>**/*.java</exclude> | ||
| </excludes> | ||
| </testResource> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/resources</directory> | ||
| </testResource> | ||
| </testResources> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>2.2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar-no-fork</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,86 @@ | ||
| <!-- | ||
| Copyright (c) 2012 - Batoo Software ve Consultancy Ltd. | ||
| Copyright (c) 2012 - Batoo Software ve Consultancy Ltd. | ||
| This copyrighted material is made available to anyone wishing to use, modify, | ||
| copy, or redistribute it subject to the terms and conditions of the GNU | ||
| Lesser General Public License, as published by the Free Software Foundation. | ||
| This copyrighted material is made available to anyone wishing to use, modify, | ||
| copy, or redistribute it subject to the terms and conditions of the GNU | ||
| Lesser General Public License, as published by the Free Software Foundation. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| for more details. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License | ||
| for more details. | ||
| You should have received a copy of the GNU Lesser General Public License | ||
| along with this distribution; if not, write to: | ||
| Free Software Foundation, Inc. | ||
| 51 Franklin Street, Fifth Floor | ||
| Boston, MA 02110-1301 USA | ||
| You should have received a copy of the GNU Lesser General Public License | ||
| along with this distribution; if not, write to: | ||
| Free Software Foundation, Inc. | ||
| 51 Franklin Street, Fifth Floor | ||
| Boston, MA 02110-1301 USA | ||
| --> | ||
| <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> | ||
| <artifactId>parent</artifactId> | ||
| <groupId>org.batoo.jpa</groupId> | ||
| <version>2.0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <packaging>bundle</packaging> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>parent</artifactId> | ||
| <groupId>org.batoo.jpa</groupId> | ||
| <version>2.0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>batoo-common</artifactId> | ||
| <name>Batoo Common Utilities</name> | ||
|
|
||
| <artifactId>batoo-common</artifactId> | ||
| <name>Batoo Common Utilities</name> | ||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/java</directory> | ||
| <excludes> | ||
| <exclude>**/*.java</exclude> | ||
| </excludes> | ||
| </testResource> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/resources</directory> | ||
| </testResource> | ||
| </testResources> | ||
|
|
||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/java</directory> | ||
| <excludes> | ||
| <exclude>**/*.java</exclude> | ||
| </excludes> | ||
| </testResource> | ||
| <testResource> | ||
| <directory>${project.basedir}/src/test/resources</directory> | ||
| </testResource> | ||
| </testResources> | ||
| <plugins> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>2.2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar-no-fork</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugins> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <version>2.2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar-no-fork</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Bundle-Version>${project.version}</Bundle-Version> | ||
| <Export-Package> | ||
| org.batoo.jpa.* | ||
| </Export-Package> | ||
| <Import-Package> | ||
| com.jolbox.bonecp;resolution:=optional, | ||
| * | ||
| </Import-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| <dependencies> | ||
| <!-- Utils --> | ||
| <dependency> | ||
| <groupId>commons-io</groupId> | ||
| <artifactId>commons-io</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-lang</groupId> | ||
| <artifactId>commons-lang</artifactId> | ||
| </dependency> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependencies> | ||
| <!-- Utils --> | ||
| <dependency> | ||
| <groupId>commons-io</groupId> | ||
| <artifactId>commons-io</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-lang</groupId> | ||
| <artifactId>commons-lang</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
Oops, something went wrong.