geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rick McGuire <rick...@gmail.com>
Subject Re: svn commit: r833312 - in /geronimo/server/trunk/plugins: activemq/geronimo-activemq/pom.xml connector-1_6/connector-deployer-1_6/pom.xml connector-1_6/geronimo-connector-builder-1_6/pom.xml j2ee/geronimo-naming-builder/pom.xml
Date Fri, 06 Nov 2009 18:45:24 GMT
David Jencks wrote:
> I don't think we can use require-bundle, it conflicts with our idea of 
> using artifact-aliases.  Can you explain the problem this is trying to 
> solve?

DynamicImport-Package looks like a viable solution here, so I've removed 
the Require-Bundle usage.

Rick
>
> thanks
> david jencks
>
> On Nov 6, 2009, at 12:17 AM, xuhaihong@apache.org wrote:
>
>> Author: xuhaihong
>> Date: Fri Nov  6 08:17:00 2009
>> New Revision: 833312
>>
>> URL: http://svn.apache.org/viewvc?rev=833312&view=rev
>> Log:
>> GERONIMO-4931 Enable ActiveMQ plugin in the OSGI environment
>> Update some import/export settings in felix-maven-plugin, also, add 
>> the geronimo-naming-builder as the required bundle of 
>> connector-deployer-1.6 to avoid the NPE
>>
>> Modified:
>>    geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
>>    
>> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml 
>>
>>    
>> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml

>>
>>    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
>>
>> Modified: 
>> geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=833312&r1=833311&r2=833312&view=diff

>>
>> ============================================================================== 
>>
>> --- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml 
>> (original)
>> +++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml 
>> Fri Nov  6 08:17:00 2009
>> @@ -64,8 +64,9 @@
>>         </dependency>
>>
>>         <dependency>
>> -            <groupId>org.slf4j</groupId>
>> -            <artifactId>jcl-over-slf4j</artifactId>
>> +            <groupId>org.ops4j.pax.logging</groupId>
>> +            <artifactId>pax-logging-api</artifactId>
>> +            <version>1.4</version>
>>         </dependency>
>>
>>         <dependency>
>>
>> Modified: 
>> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml 
>>
>> URL: 
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml?rev=833312&r1=833311&r2=833312&view=diff

>>
>> ============================================================================== 
>>
>> --- 
>> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml 
>> (original)
>> +++ 
>> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml 
>> Fri Nov  6 08:17:00 2009
>> @@ -118,7 +118,7 @@
>>                     <instructions>
>>                         <!--packages containing "impl" or "internal" 
>> are excluded by default -->
>>                         
>> <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",org.apache.geronimo.deployment.xbeans.impl,org.apache.geronimo.deployment.javabean.xbeans.impl</Import-Package>

>>
>> -                        
>> <Require-Bundle>org.apache.geronimo.framework.geronimo-service-builder</Require-Bundle>

>>
>> +                        
>> <Require-Bundle>org.apache.geronimo.framework.geronimo-service-builder,org.apache.geronimo.modules.geronimo-naming-builder</Require-Bundle>

>>
>>                         
>> <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->

>>
>>                     </instructions>
>>                     <instance>
>>
>> Modified: 
>> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml

>>
>> URL: 
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=833312&r1=833311&r2=833312&view=diff

>>
>> ============================================================================== 
>>
>> --- 
>> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml

>> (original)
>> +++ 
>> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml

>> Fri Nov  6 08:17:00 2009
>> @@ -100,7 +100,7 @@
>>                     <instructions>
>>                         <!--packages containing "impl" or "internal" 
>> are excluded by default -->
>>                         
>> <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",org.apache.geronimo.deployment.xbeans.impl,org.apache.geronimo.deployment.javabean.xbeans.impl,*</Import-Package>

>>
>> -                        
>> <Require-Bundle>org.apache.geronimo.framework.geronimo-service-builder</Require-Bundle>

>>
>> +                        
>> <Require-Bundle>org.apache.geronimo.framework.geronimo-service-builder,org.apache.geronimo.modules.geronimo-naming-builder</Require-Bundle>

>>
>>                         
>> <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->

>>
>>                     </instructions>
>>                 </configuration>
>>
>> Modified: 
>> geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
>> URL: 
>> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=833312&r1=833311&r2=833312&view=diff

>>
>> ============================================================================== 
>>
>> --- 
>> geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml 
>> (original)
>> +++ 
>> geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml 
>> Fri Nov  6 08:17:00 2009
>> @@ -73,8 +73,14 @@
>>                 <artifactId>maven-bundle-plugin</artifactId>
>>                 <configuration>
>>                     <instructions>
>> -                        
>> <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>

>>
>>                         
>> <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->

>>
>> +                        
>> <Import-Package>org.apache.xmlbeans.impl.schema,*</Import-Package>
>> +                        <Export-Package>
>> +                            schemaorg_apache_xmlbeans*,
>> +                            
>> org.apache.geronimo.xbeans.geronimo.naming*,
>> +                            
>> org.apache.geronimo.xbeans.geronimo.naming.impl,
>> +                            org.apache.geronimo.naming.deployment*
>> +                        </Export-Package>
>>                     </instructions>
>>                 </configuration>
>>             </plugin>
>>
>>
>
>


Mime
View raw message