You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2010/10/05 20:09:53 UTC

svn commit: r1004751 - in /camel/trunk/examples/camel-example-reportincident-ws-security-osgi: pom.xml src/main/resources/META-INF/ src/main/resources/etc/META-INF/

Author: cmoulliard
Date: Tue Oct  5 18:09:52 2010
New Revision: 1004751

URL: http://svn.apache.org/viewvc?rev=1004751&view=rev
Log:
add missing instruction to include resources in OSGI bundle

Added:
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/etc/META-INF/
      - copied from r1000548, camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
Removed:
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
Modified:
    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml

Modified: camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1004751&r1=1004750&r2=1004751&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml Tue Oct  5 18:09:52 2010
@@ -155,6 +155,14 @@
 	</dependencies>
 
     <build>
+    
+		<resources>
+			<resource>
+				<directory>src/main/resources/etc</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>    
+    
         <plugins>
 
             <!-- to compile with 1.5 -->
@@ -252,6 +260,7 @@
 							org.springframework.mail.javamail,
 						    *
 					    </Import-Package>
+					    <_include>src/main/resources/etc</_include>
 					</instructions>
 				</configuration>
 			</plugin>



Re: svn commit: r1004751 - in /camel/trunk/examples/camel-example-reportincident-ws-security-osgi: pom.xml src/main/resources/META-INF/ src/main/resources/etc/META-INF/

Posted by Claus Ibsen <cl...@gmail.com>.
Hi

I have fixed it now.


On Wed, Oct 6, 2010 at 4:46 PM, Claus Ibsen <cl...@gmail.com> wrote:
> Hi Charles
>
> This doesn't build. Can you take a look
>
>
> [INFO] [bundle:bundle {execution: default-bundle}]
> [ERROR] Error building bundle
> org.apache.camel:camel-example-reportincident-wssecurity:bundle:2.5-SNAPSHOT
> : Included file
> /Users/davsclaus/workspace/camel/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/etc
> does not exist
> [ERROR] Error(s) found in bundle configuration
> [INFO] ------------------------------------------------------------------------
> [ERROR] BUILD ERROR
> [INFO] ------------------------------------------------------------------------
>
>
>
> On Tue, Oct 5, 2010 at 8:09 PM,  <cm...@apache.org> wrote:
>> Author: cmoulliard
>> Date: Tue Oct  5 18:09:52 2010
>> New Revision: 1004751
>>
>> URL: http://svn.apache.org/viewvc?rev=1004751&view=rev
>> Log:
>> add missing instruction to include resources in OSGI bundle
>>
>> Added:
>>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/etc/META-INF/
>>      - copied from r1000548, camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
>> Removed:
>>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
>> Modified:
>>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
>>
>> Modified: camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
>> URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1004751&r1=1004750&r2=1004751&view=diff
>> ==============================================================================
>> --- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml (original)
>> +++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml Tue Oct  5 18:09:52 2010
>> @@ -155,6 +155,14 @@
>>        </dependencies>
>>
>>     <build>
>> +
>> +               <resources>
>> +                       <resource>
>> +                               <directory>src/main/resources/etc</directory>
>> +                               <filtering>true</filtering>
>> +                       </resource>
>> +               </resources>
>> +
>>         <plugins>
>>
>>             <!-- to compile with 1.5 -->
>> @@ -252,6 +260,7 @@
>>                                                        org.springframework.mail.javamail,
>>                                                    *
>>                                            </Import-Package>
>> +                                           <_include>src/main/resources/etc</_include>
>>                                        </instructions>
>>                                </configuration>
>>                        </plugin>
>>
>>
>>
>
>
>
> --
> Claus Ibsen
> Apache Camel Committer
>
> Author of Camel in Action: http://www.manning.com/ibsen/
> Open Source Integration: http://fusesource.com
> Blog: http://davsclaus.blogspot.com/
> Twitter: http://twitter.com/davsclaus
>



-- 
Claus Ibsen
Apache Camel Committer

Author of Camel in Action: http://www.manning.com/ibsen/
Open Source Integration: http://fusesource.com
Blog: http://davsclaus.blogspot.com/
Twitter: http://twitter.com/davsclaus

Re: svn commit: r1004751 - in /camel/trunk/examples/camel-example-reportincident-ws-security-osgi: pom.xml src/main/resources/META-INF/ src/main/resources/etc/META-INF/

Posted by Claus Ibsen <cl...@gmail.com>.
Hi Charles

This doesn't build. Can you take a look


[INFO] [bundle:bundle {execution: default-bundle}]
[ERROR] Error building bundle
org.apache.camel:camel-example-reportincident-wssecurity:bundle:2.5-SNAPSHOT
: Included file
/Users/davsclaus/workspace/camel/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/etc
does not exist
[ERROR] Error(s) found in bundle configuration
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------



On Tue, Oct 5, 2010 at 8:09 PM,  <cm...@apache.org> wrote:
> Author: cmoulliard
> Date: Tue Oct  5 18:09:52 2010
> New Revision: 1004751
>
> URL: http://svn.apache.org/viewvc?rev=1004751&view=rev
> Log:
> add missing instruction to include resources in OSGI bundle
>
> Added:
>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/etc/META-INF/
>      - copied from r1000548, camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
> Removed:
>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/src/main/resources/META-INF/
> Modified:
>    camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
>
> Modified: camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1004751&r1=1004750&r2=1004751&view=diff
> ==============================================================================
> --- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml (original)
> +++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml Tue Oct  5 18:09:52 2010
> @@ -155,6 +155,14 @@
>        </dependencies>
>
>     <build>
> +
> +               <resources>
> +                       <resource>
> +                               <directory>src/main/resources/etc</directory>
> +                               <filtering>true</filtering>
> +                       </resource>
> +               </resources>
> +
>         <plugins>
>
>             <!-- to compile with 1.5 -->
> @@ -252,6 +260,7 @@
>                                                        org.springframework.mail.javamail,
>                                                    *
>                                            </Import-Package>
> +                                           <_include>src/main/resources/etc</_include>
>                                        </instructions>
>                                </configuration>
>                        </plugin>
>
>
>



-- 
Claus Ibsen
Apache Camel Committer

Author of Camel in Action: http://www.manning.com/ibsen/
Open Source Integration: http://fusesource.com
Blog: http://davsclaus.blogspot.com/
Twitter: http://twitter.com/davsclaus