You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hise-commits@incubator.apache.org by rr...@apache.org on 2010/03/10 20:28:00 UTC
svn commit: r921551 - in /incubator/hise/trunk: hise-bundle/pom.xml
hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml
hise-karaf/src/main/resources/features.xml
Author: rr
Date: Wed Mar 10 20:28:00 2010
New Revision: 921551
URL: http://svn.apache.org/viewvc?rev=921551&view=rev
Log:
Cleaned up bundle and features
Modified:
incubator/hise/trunk/hise-bundle/pom.xml
incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml
incubator/hise/trunk/hise-karaf/src/main/resources/features.xml
Modified: incubator/hise/trunk/hise-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/pom.xml?rev=921551&r1=921550&r2=921551&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/pom.xml (original)
+++ incubator/hise/trunk/hise-bundle/pom.xml Wed Mar 10 20:28:00 2010
@@ -33,72 +33,8 @@
<artifactId>hise-bundle</artifactId>
<version>0.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <profiles>
- <profile>
- <id>itest</id>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources-itest</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
- </profile>
- </profiles>
-
- <pluginRepositories>
- <pluginRepository>
- <id>open.iona.m2-snapshot</id>
- <name>IONA Snapshots Repository</name>
- <url>http://repo.open.iona.com/maven2-snapshot/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>open.iona.m2</id>
- <name>IONA Repository</name>
- <url>http://repo.open.iona.com/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<build>
- <plugins>
- <!--
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/karaf</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/karaf</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -108,127 +44,37 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.persistence,
- javax.xml.bind,
- javax.xml.soap,
- META-INF.cxf,
- META-INF.cxf.osgi,
- org.apache.cxf.resource,
- org.apache.cxf.binding.soap.spring,
- org.apache.cxf.ws.security.wss4j,
- org.apache.cxf.jaxws.spi,
-
- org.springframework.osgi.config,
- org.springframework.osgi.context,
- org.springframework.osgi.context.support,
- org.springframework.osgi.service,
- org.springframework.osgi.service.importer,
-
+javax.persistence,
+javax.xml.bind,
+javax.xml.soap,
+META-INF.cxf,
+META-INF.cxf.osgi,
+org.apache.cxf.resource,
+org.apache.cxf.binding.soap.spring,
+org.apache.cxf.ws.security.wss4j,
+org.apache.cxf.jaxws.spi,
org.apache.openjpa.persistence,
-
-net.sf.saxon.xpath
+javax.security.auth.callback,
+org.apache.ws.security,
+net.sf.saxon.xpath,
+org.springframework.osgi.config,
+org.springframework.osgi.context,
+org.springframework.osgi.context.support,
+org.springframework.osgi.service,
+org.springframework.osgi.service.importer
</Import-Package>
- <!--
-org.h2,
- org.apache.openjpa.persistence,
- org.apache.openjpa.jdbc.sql
- org.springframework.orm,
- org.springframework.beans,
- org.springframework.jdbc,
- org.springframework.jdbc.datasource,
- <Private-Package>org.apache.hise*</Private-Package>
- -->
<Export-Package>org.apache.hise*,org.w3._2001.xmlschema</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Require-Bundle>
org.apache.cxf.bundle
</Require-Bundle>
- <!--
- -->
- <!--
-
- <DynamicImport-Package>org.w3.*,javax.xml.xquery</DynamicImport-Package>
- org.w3.*,
- net.sf.saxon*
- <Embed-Dependency>saxon*,spring-orm,spring-jdbc,ojdbc5;scope=compile|runtime</Embed-Dependency>
- -->
- <Embed-Dependency>h2,spring-orm,spring-jdbc,spring-aspects,hise-wsdl;scope=compile|runtime;inline=**</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <!--
- -->
-
- <!--
- <_exportcontents>org.apache.hise*</_exportcontents>
- -->
- <!--
- <DynamicImport-Package>*</DynamicImport-Package>
-<Include-Resource>
- {maven-resources}, {maven-dependencies}
-</Include-Resource>
- -->
- <!--
- <Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
- -->
+ <Embed-Dependency>hise-wsdl;scope=compile|runtime;inline=**</Embed-Dependency>
</instructions>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/karaf/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.felix.karaf.tooling</groupId>
- <artifactId>features-maven-plugin</artifactId>
- <version>1.2.0</version>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.felix.karaf.tooling</groupId>
- <artifactId>features-maven-plugin</artifactId>
- <version>1.2.0-psc-01-01RC1</version>
- <executions>
- <execution>
- <id>generate-features</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate-features-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
-
- </plugins>
- </build>
+ </plugins>
+ </build>
<dependencies>
-
- <dependency>
- <groupId>org.apache.hise</groupId>
- <artifactId>hise-test-example</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.hise</groupId>
<artifactId>hise-wsdl</artifactId>
@@ -239,173 +85,5 @@ org.h2,
<artifactId>hise-services</artifactId>
<version>${project.version}</version>
</dependency>
-
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.2</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- <version>1.2.0</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.108</version>
- <scope>runtime</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>oracle</groupId>
- <artifactId>ojdbc5</artifactId>
- <version>11.1.0.6.0</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- <version>${cxf.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jaxb-xjc</artifactId>
- <groupId>com.sun.xml.bind</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>soap</groupId>
- <artifactId>soap</artifactId>
- <scope>runtime</scope>
- <version>2.3.1</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <scope>runtime</scope>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.openjpa</artifactId>
- <version>1.2.1_2</version>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
- <version>9.1.0.8_3</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.serp</artifactId>
- <version>1.13.1_2</version>
- </dependency>
-
</dependencies>
</project>
Modified: incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml?rev=921551&r1=921550&r2=921551&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml (original)
+++ incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise-ds.xml Wed Mar 10 20:28:00 2010
@@ -41,8 +41,11 @@ http://www.springframework.org/schema/os
<prop key="db.user">sa</prop>
<prop key="db.password"></prop>
<prop key="db.maxActive">4</prop>
+ <prop key="db.minIdle">0</prop>
<prop key="db.maxIdle">0</prop>
<prop key="db.testOnBorrow">true</prop>
+ <prop key="db.testWhileIdle">true</prop>
+ <prop key="db.timeBetweenEvictionRunsMillis">5000</prop>
</osgix:cm-properties>
<ctx:property-placeholder properties-ref="preProps" />
Modified: incubator/hise/trunk/hise-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-karaf/src/main/resources/features.xml?rev=921551&r1=921550&r2=921551&view=diff
==============================================================================
--- incubator/hise/trunk/hise-karaf/src/main/resources/features.xml (original)
+++ incubator/hise/trunk/hise-karaf/src/main/resources/features.xml Wed Mar 10 20:28:00 2010
@@ -23,9 +23,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.13.1_2</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
- <bundle>mvn:org.apache.ws.security/wss4j/1.5.8</bundle>
- <bundle>mvn:org.apache.cxf/cxf-rt-transports-http/2.2.6</bundle>
- <bundle>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/2.2.6</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-aspects/${spring.version}</bundle>
<bundle>mvn:org.apache.hise/hise-bundle/${project.version}</bundle>
</feature>
<feature name="hise-h2" version="${project.version}">
@@ -45,7 +45,7 @@
<bundle>mvn:org.apache.hise/hise-test-example-osgi/${project.version}</bundle>
</feature>
<feature name="hise-sqlserver-test-example-osgi" version="${project.version}">
- <bundle>mvn:org.apache.hise/hise-test-example-osgi/${project.version}</bundle>
<feature version="${project.version}">hise-sqlserver</feature>
+ <bundle>mvn:org.apache.hise/hise-test-example-osgi/${project.version}</bundle>
</feature>
</features>