You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@aries.apache.org by Joe Bohn <jo...@gmail.com> on 2010/03/29 22:32:43 UTC
Re: svn commit: r927946 - in /incubator/aries/trunk/application:
./ application-itests/src/test/resources/basic/ application-itests/src/test/resources/obr/
application-management/src/main/resources/org/apache/aries/application/messages/
application-managem...
It turns out that the addition of the license header in the test
APPLICATION.MF files below is causing a number of tests to fail. This
is because the tests are expecting normal manifest files which don't
support comments (at least as far as I know).
We can ignore the comment lines in ManifestProcessor but that doesn't
solve all of the failures because some tests instantiate a
java.util.jar.Manifest from the APPLIACTION.MF which results in an
IOException due to an invalid header.
Should we just remove the license headers from the APPLICATION.MF files
and treat these as an exception for RAT?
Joe
hughesj@apache.org wrote:
> Author: hughesj
> Date: Fri Mar 26 16:08:07 2010
> New Revision: 927946
>
> URL: http://svn.apache.org/viewvc?rev=927946&view=rev
> Log:
> ARIES-267 application module now RATified
>
> Modified:
> incubator/aries/trunk/application/application-itests/src/test/resources/basic/APPLICATION.MF
> incubator/aries/trunk/application/application-itests/src/test/resources/obr/APPLICATION.MF
> incubator/aries/trunk/application/application-management/src/main/resources/org/apache/aries/application/messages/AppManagementMessages.properties
> incubator/aries/trunk/application/application-management/src/test/resources/bundles/repository/a.handy.persistence.library.jar/META-INF/MANIFEST.MF
> incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/META-INF/APPLICATION.MF
> incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/foo.bar.widgets.jar/META-INF/MANIFEST.MF
> incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/my.business.logic.jar/META-INF/MANIFEST.MF
> incubator/aries/trunk/application/application-obr-resolver/pom.xml
> incubator/aries/trunk/application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties
> incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION2.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION3.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
> incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
> incubator/aries/trunk/application/application-utils/src/test/resources/zip/file.txt
> incubator/aries/trunk/application/application-utils/src/test/resources/zip/subdir/someFile.txt
> incubator/aries/trunk/application/pom.xml
>
> Modified: incubator/aries/trunk/application/application-itests/src/test/resources/basic/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/resources/basic/APPLICATION.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-itests/src/test/resources/basic/APPLICATION.MF (original)
> +++ incubator/aries/trunk/application/application-itests/src/test/resources/basic/APPLICATION.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: test application 2
>
> Modified: incubator/aries/trunk/application/application-itests/src/test/resources/obr/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/resources/obr/APPLICATION.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-itests/src/test/resources/obr/APPLICATION.MF (original)
> +++ incubator/aries/trunk/application/application-itests/src/test/resources/obr/APPLICATION.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: test application 2
>
> Modified: incubator/aries/trunk/application/application-management/src/main/resources/org/apache/aries/application/messages/AppManagementMessages.properties
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/resources/org/apache/aries/application/messages/AppManagementMessages.properties?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-management/src/main/resources/org/apache/aries/application/messages/AppManagementMessages.properties (original)
> +++ incubator/aries/trunk/application/application-management/src/main/resources/org/apache/aries/application/messages/AppManagementMessages.properties Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> APPMANAGEMENT0001E=APPMANAGEMENT0001E: Unable to fully delete directory {0}.
> APPMANAGEMENT0002E=APPMANAGEMENT0002E: Unable to create Aries application from {0} since APPLICATION.MF symbolic name {1} does not equals DEPLOYMENT.MF symbolic name {2}.
> APPMANAGEMENT0003E=APPMANAGEMENT0003E: Invalid bundle {0} found when DEPLOYMENT.MF present in {1}.
> @@ -5,4 +23,4 @@ APPMANAGEMENT0004E=APPMANAGEMENT0004E: E
> APPMANAGEMENT0005E=APPMANAGEMENT0005E: Failed to create application from {0} due to conversion errors: see log for details.
> APPMANAGEMENT0006E=APPMANAGEMENT0006E: IOException encountered while constructing Aries application from {0}: {1}.
> APPMANAGEMENT0007E=APPMANAGEMENT0007E: IOException encountered while parsing APPICATION.MF in {0}: {1}.
> -APPMANAGEMENT0008E=APPMANAGEMENT0008E: ResolverException encountered while constructing Aries application from {0}: {1}.
> \ No newline at end of file
> +APPMANAGEMENT0008E=APPMANAGEMENT0008E: ResolverException encountered while constructing Aries application from {0}: {1}.
>
> Modified: incubator/aries/trunk/application/application-management/src/test/resources/bundles/repository/a.handy.persistence.library.jar/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/resources/bundles/repository/a.handy.persistence.library.jar/META-INF/MANIFEST.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-management/src/test/resources/bundles/repository/a.handy.persistence.library.jar/META-INF/MANIFEST.MF (original)
> +++ incubator/aries/trunk/application/application-management/src/test/resources/bundles/repository/a.handy.persistence.library.jar/META-INF/MANIFEST.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
> Bundle-Name: HandyPersistenceLibrary
>
> Modified: incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/META-INF/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/META-INF/APPLICATION.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/META-INF/APPLICATION.MF (original)
> +++ incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/META-INF/APPLICATION.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: Test application
>
> Modified: incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/foo.bar.widgets.jar/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/foo.bar.widgets.jar/META-INF/MANIFEST.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/foo.bar.widgets.jar/META-INF/MANIFEST.MF (original)
> +++ incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/foo.bar.widgets.jar/META-INF/MANIFEST.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
> Bundle-Name: FooBarWidgets
>
> Modified: incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/my.business.logic.jar/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/my.business.logic.jar/META-INF/MANIFEST.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/my.business.logic.jar/META-INF/MANIFEST.MF (original)
> +++ incubator/aries/trunk/application/application-management/src/test/resources/bundles/test.eba/my.business.logic.jar/META-INF/MANIFEST.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
> Bundle-Name: MyBusinessLogic
>
> Modified: incubator/aries/trunk/application/application-obr-resolver/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/pom.xml?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-obr-resolver/pom.xml (original)
> +++ incubator/aries/trunk/application/application-obr-resolver/pom.xml Fri Mar 26 16:08:07 2010
> @@ -1,4 +1,19 @@
> <?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
> xmlns="http://maven.apache.org/POM/4.0.0"
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
>
> Modified: incubator/aries/trunk/application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties (original)
> +++ incubator/aries/trunk/application/application-utils/src/main/resources/org/apache/aries/application/utils/messages/APPUTILSmessages.properties Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> APPUTILS0004E=APPUTILS0004E: Unable to create ContentImpl object based on content: {0}.
> APPUTILS0007E=APPUTILS0007E: The path {0} does not denote a valid file.
> APPUTILS0008E=APPUTILS0008E: Unable to parse the string, because one of the quotations marks (") is missing: {0}.
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: Travel Reservation
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION2.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION2.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION2.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION2.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: Travel Reservation
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION3.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION3.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION3.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/META-INF/APPLICATION3.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Application-SymbolicName: org.apache.aries.applications.test.app
> Application-Version: 1.4.0
> Application-Content: org.apache.aries.applications.test.bundle
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/APPLICATION.MF Fri Mar 26 16:08:07 2010
> @@ -1,3 +1,21 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-ManifestVersion: 1.0
> Application-Name: Travel Reservation
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/app1/META-INF/DEPLOYMENT.MF Fri Mar 26 16:08:07 2010
> @@ -1,6 +1,24 @@
> +#
> +# 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.
> +#
> Manifest-Version: 1.0
> Application-SymbolicName: com.travel.reservation
> Application-Version: 1.2
> Deployed-Content: com.travel.reservation.web;deployed-version="1.1.0",
> com.travel.reservation.business;deployed-version=2.0
> - com.travel.reservation.data;deployed-version=2.1.1
> \ No newline at end of file
> + com.travel.reservation.data;deployed-version=2.1.1
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/MANIFEST.MF Fri Mar 26 16:08:07 2010
> @@ -1,2 +1,20 @@
> +#
> +# 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.
> +#
> Bundle-SymbolicName: com.ibm.test;singleton:=true
> Bundle-Version: 1.0.0
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/bundles/exploded.jar/META-INF/beforeManifest.file Fri Mar 26 16:08:07 2010
> @@ -0,0 +1,19 @@
> +#
> +# 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.
> +#
> +
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/zip/file.txt
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/zip/file.txt?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/zip/file.txt (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/zip/file.txt Fri Mar 26 16:08:07 2010
> @@ -1 +1,19 @@
> +#
> +# 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.
> +#
> abc
> \ No newline at end of file
>
> Modified: incubator/aries/trunk/application/application-utils/src/test/resources/zip/subdir/someFile.txt
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/test/resources/zip/subdir/someFile.txt?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/application-utils/src/test/resources/zip/subdir/someFile.txt (original)
> +++ incubator/aries/trunk/application/application-utils/src/test/resources/zip/subdir/someFile.txt Fri Mar 26 16:08:07 2010
> @@ -1 +1,19 @@
> +#
> +# 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.
> +#
> def
> \ No newline at end of file
>
> Modified: incubator/aries/trunk/application/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/pom.xml?rev=927946&r1=927945&r2=927946&view=diff
> ==============================================================================
> --- incubator/aries/trunk/application/pom.xml (original)
> +++ incubator/aries/trunk/application/pom.xml Fri Mar 26 16:08:07 2010
> @@ -1,45 +1,46 @@
> <?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/maven-v4_0_0.xsd">
> -
> - <parent>
> - <groupId>org.apache.aries</groupId>
> - <artifactId>java5-parent</artifactId>
> - <version>0.1-incubating-SNAPSHOT</version>
> - </parent>
> -
> - <modelVersion>4.0.0</modelVersion>
> - <groupId>org.apache.aries.application</groupId>
> - <artifactId>application</artifactId>
> - <name>Apache Aries Application</name>
> - <version>0.1-incubating-SNAPSHOT</version>
> - <packaging>pom</packaging>
> + 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/maven-v4_0_0.xsd">
> +
> + <parent>
> + <groupId>org.apache.aries</groupId>
> + <artifactId>java5-parent</artifactId>
> + <version>0.1-incubating-SNAPSHOT</version>
> + </parent>
> +
> + <modelVersion>4.0.0</modelVersion>
> + <groupId>org.apache.aries.application</groupId>
> + <artifactId>application</artifactId>
> + <name>Apache Aries Application</name>
> + <version>0.1-incubating-SNAPSHOT</version>
> + <packaging>pom</packaging>
>
> - <description>
> + <description>
> Application support for Aries
> </description>
>
> - <scm>
> - <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/application</connection>
> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/application</developerConnection>
> - <url>http://svn.apache.org/viewvc/incubator/aries/trunk/application</url>
> - </scm>
> + <scm>
> + <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/trunk/application</connection>
> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/application</developerConnection>
> + <url>http://svn.apache.org/viewvc/incubator/aries/trunk/application</url>
> + </scm>
>
> - <dependencyManagement>
> - <dependencies>
> + <dependencyManagement>
> + <dependencies>
> <dependency>
> <groupId>asm</groupId>
> <artifactId>asm-all</artifactId>
> @@ -55,16 +56,16 @@
> <artifactId>org.apache.aries.blueprint</artifactId>
> <version>0.1-incubating-SNAPSHOT</version>
> </dependency>
> - <dependency>
> - <groupId>org.apache.aries.testsupport</groupId>
> - <artifactId>org.apache.aries.testsupport.unit</artifactId>
> - <version>0.1-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.aries.web</groupId>
> - <artifactId>org.apache.aries.web.urlhandler</artifactId>
> - <version>0.1-incubating-SNAPSHOT</version>
> - </dependency>
> + <dependency>
> + <groupId>org.apache.aries.testsupport</groupId>
> + <artifactId>org.apache.aries.testsupport.unit</artifactId>
> + <version>0.1-incubating-SNAPSHOT</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.aries.web</groupId>
> + <artifactId>org.apache.aries.web.urlhandler</artifactId>
> + <version>0.1-incubating-SNAPSHOT</version>
> + </dependency>
> <dependency>
> <groupId>org.apache.felix</groupId>
> <artifactId>org.apache.felix.bundlerepository</artifactId>
> @@ -148,20 +149,20 @@
> <artifactId>org.apache.aries.application.utils</artifactId>
> <version>${version}</version>
> </dependency>
> - </dependencies>
> - </dependencyManagement>
> + </dependencies>
> + </dependencyManagement>
>
> - <modules>
> - <module>application-utils</module>
> - <module>application-api</module>
> - <module>application-management</module>
> - <module>application-converters</module>
> - <module>application-runtime</module>
> - <module>application-itest-interface</module>
> - <module>application-itests</module>
> - <module>application-obr-resolver</module>
> - <module>application-install</module>
> - <module>application-bundle</module>
> - </modules>
> + <modules>
> + <module>application-utils</module>
> + <module>application-api</module>
> + <module>application-management</module>
> + <module>application-converters</module>
> + <module>application-runtime</module>
> + <module>application-itest-interface</module>
> + <module>application-itests</module>
> + <module>application-obr-resolver</module>
> + <module>application-install</module>
> + <module>application-bundle</module>
> + </modules>
>
> </project>
>
>
>
--
Joe