ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r790841 - in /incubator/ace/trunk: liq/ liq/lib/felix/1.4.1/ liq/lib/felix/1.8.1/ liq/lib/felix/1.8.1/bin/ liq/lib/felix/1.8.1/bundle/ liq/lib/felix/1.8.1/conf/ test/
Date Fri, 03 Jul 2009 09:57:14 GMT
Author: marrs
Date: Fri Jul  3 09:57:13 2009
New Revision: 790841

URL: http://svn.apache.org/viewvc?rev=790841&view=rev
Log:
ACE-20 Applied (part of) the patch to upgrade to Felix 1.8.1.

Added:
    incubator/ace/trunk/liq/.fbprefs
    incubator/ace/trunk/liq/lib/felix/1.8.1/
    incubator/ace/trunk/liq/lib/felix/1.8.1/bin/
    incubator/ace/trunk/liq/lib/felix/1.8.1/bin/felix.jar   (with props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/
    incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.bundlerepository-1.4.0.jar
  (with props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar   (with
props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell.tui-1.2.0.jar  
(with props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/conf/
    incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties   (with props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties   (with props)
    incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties   (with props)
Removed:
    incubator/ace/trunk/liq/lib/felix/1.4.1/
Modified:
    incubator/ace/trunk/liq/.classpath
    incubator/ace/trunk/liq/build.xml
    incubator/ace/trunk/liq/target-dev-client.xml
    incubator/ace/trunk/liq/target-dev-customlicenseclient.xml
    incubator/ace/trunk/liq/target-dev-customlicenseserver.xml
    incubator/ace/trunk/liq/target-dev-gateway-ma.xml
    incubator/ace/trunk/liq/target-dev-gateway-upnp.xml
    incubator/ace/trunk/liq/target-dev-gateway.xml
    incubator/ace/trunk/liq/target-dev-licensedgateway.xml
    incubator/ace/trunk/liq/target-dev-multigateway.xml
    incubator/ace/trunk/liq/target-dev-obr.xml
    incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml
    incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml
    incubator/ace/trunk/liq/target-dev-relay.xml
    incubator/ace/trunk/liq/target-dev-server-upnp.xml
    incubator/ace/trunk/liq/target-dev-server.xml
    incubator/ace/trunk/liq/target-test.xml
    incubator/ace/trunk/test/.classpath

Modified: incubator/ace/trunk/liq/.classpath
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/.classpath?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/.classpath (original)
+++ incubator/ace/trunk/liq/.classpath Fri Jul  3 09:57:13 2009
@@ -22,6 +22,6 @@
 	<classpathentry exported="true" kind="lib" path="ext/org.osgi.service.obr-1.1.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
 	<classpathentry exported="true" kind="lib" path="ext/jcalendar-1.3.2.jar"/>
-	<classpathentry kind="lib" path="lib/felix/1.4.1/bundle/org.apache.felix.shell-1.0.2.jar"/>
+	<classpathentry kind="lib" path="lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Added: incubator/ace/trunk/liq/.fbprefs
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/.fbprefs?rev=790841&view=auto
==============================================================================
--- incubator/ace/trunk/liq/.fbprefs (added)
+++ incubator/ace/trunk/liq/.fbprefs Fri Jul  3 09:57:13 2009
@@ -0,0 +1,124 @@
+#FindBugs User Preferences
+#Fri Jul 03 11:50:08 CEST 2009
+detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
+detectorBadAppletConstructor=BadAppletConstructor|false
+detectorBadResultSetAccess=BadResultSetAccess|true
+detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
+detectorBadUseOfReturnValue=BadUseOfReturnValue|true
+detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
+detectorBooleanReturnNull=BooleanReturnNull|true
+detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true
+detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
+detectorCheckTypeQualifiers=CheckTypeQualifiers|true
+detectorCloneIdiom=CloneIdiom|true
+detectorComparatorIdiom=ComparatorIdiom|true
+detectorConfusedInheritance=ConfusedInheritance|true
+detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
+detectorCrossSiteScripting=CrossSiteScripting|true
+detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
+detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
+detectorDontUseEnum=DontUseEnum|true
+detectorDroppedException=DroppedException|true
+detectorDumbMethodInvocations=DumbMethodInvocations|true
+detectorDumbMethods=DumbMethods|true
+detectorDuplicateBranches=DuplicateBranches|true
+detectorEmptyZipFileEntry=EmptyZipFileEntry|true
+detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true
+detectorFinalizerNullsFields=FinalizerNullsFields|true
+detectorFindBadCast2=FindBadCast2|true
+detectorFindBadForLoop=FindBadForLoop|true
+detectorFindCircularDependencies=FindCircularDependencies|false
+detectorFindDeadLocalStores=FindDeadLocalStores|true
+detectorFindDoubleCheck=FindDoubleCheck|true
+detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
+detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
+detectorFindFinalizeInvocations=FindFinalizeInvocations|true
+detectorFindFloatEquality=FindFloatEquality|true
+detectorFindHEmismatch=FindHEmismatch|true
+detectorFindInconsistentSync2=FindInconsistentSync2|true
+detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
+detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
+detectorFindMaskedFields=FindMaskedFields|true
+detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
+detectorFindNakedNotify=FindNakedNotify|true
+detectorFindNonSerializableStoreIntoSession=FindNonSerializableStoreIntoSession|true
+detectorFindNonSerializableValuePassedToWriteObject=FindNonSerializableValuePassedToWriteObject|true
+detectorFindNonShortCircuit=FindNonShortCircuit|true
+detectorFindNullDeref=FindNullDeref|true
+detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true
+detectorFindOpenStream=FindOpenStream|true
+detectorFindPuzzlers=FindPuzzlers|true
+detectorFindRefComparison=FindRefComparison|true
+detectorFindReturnRef=FindReturnRef|true
+detectorFindRunInvocations=FindRunInvocations|true
+detectorFindSelfComparison=FindSelfComparison|true
+detectorFindSelfComparison2=FindSelfComparison2|true
+detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
+detectorFindSpinLoop=FindSpinLoop|true
+detectorFindSqlInjection=FindSqlInjection|true
+detectorFindTwoLockWait=FindTwoLockWait|true
+detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
+detectorFindUnconditionalWait=FindUnconditionalWait|true
+detectorFindUninitializedGet=FindUninitializedGet|true
+detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
+detectorFindUnreleasedLock=FindUnreleasedLock|true
+detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true
+detectorFindUnsyncGet=FindUnsyncGet|true
+detectorFindUselessControlFlow=FindUselessControlFlow|true
+detectorFormatStringChecker=FormatStringChecker|true
+detectorHugeSharedStringConstants=HugeSharedStringConstants|true
+detectorIDivResultCastToDouble=IDivResultCastToDouble|true
+detectorIncompatMask=IncompatMask|true
+detectorInconsistentAnnotations=InconsistentAnnotations|true
+detectorInefficientMemberAccess=InefficientMemberAccess|false
+detectorInefficientToArray=InefficientToArray|true
+detectorInfiniteLoop=InfiniteLoop|true
+detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
+detectorInfiniteRecursiveLoop2=InfiniteRecursiveLoop2|false
+detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
+detectorInitializationChain=InitializationChain|true
+detectorInstantiateStaticClass=InstantiateStaticClass|true
+detectorInvalidJUnitTest=InvalidJUnitTest|true
+detectorIteratorIdioms=IteratorIdioms|true
+detectorLazyInit=LazyInit|true
+detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
+detectorMethodReturnCheck=MethodReturnCheck|true
+detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
+detectorMutableLock=MutableLock|true
+detectorMutableStaticFields=MutableStaticFields|true
+detectorNaming=Naming|true
+detectorNumberConstructor=NumberConstructor|true
+detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true
+detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
+detectorPublicSemaphores=PublicSemaphores|false
+detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
+detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
+detectorRedundantInterfaces=RedundantInterfaces|true
+detectorRepeatedConditionals=RepeatedConditionals|true
+detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
+detectorSerializableIdiom=SerializableIdiom|true
+detectorStartInConstructor=StartInConstructor|true
+detectorStaticCalendarDetector=StaticCalendarDetector|true
+detectorStringConcatenation=StringConcatenation|true
+detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
+detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
+detectorSwitchFallthrough=SwitchFallthrough|true
+detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
+detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true
+detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true
+detectorURLProblems=URLProblems|true
+detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
+detectorUnnecessaryMath=UnnecessaryMath|true
+detectorUnreadFields=UnreadFields|true
+detectorUseObjectEquals=UseObjectEquals|false
+detectorUselessSubclassMethod=UselessSubclassMethod|false
+detectorVarArgsProblems=VarArgsProblems|true
+detectorVolatileUsage=VolatileUsage|true
+detectorWaitInLoop=WaitInLoop|true
+detectorWrongMapIterator=WrongMapIterator|true
+detectorXMLFactoryBypass=XMLFactoryBypass|true
+detector_threshold=2
+effort=default
+filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false
+filter_settings_neg=|
+run_at_full_build=true

Modified: incubator/ace/trunk/liq/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/build.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/build.xml (original)
+++ incubator/ace/trunk/liq/build.xml Fri Jul  3 09:57:13 2009
@@ -11,7 +11,7 @@
         <fileset dir="ext">
             <include name="**/*.jar" />
         </fileset>
-    	<pathelement location="lib/felix/1.4.1/bundle/org.apache.felix.shell-1.0.2.jar" />
+    	<pathelement location="lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar" />
     </path>
 
     <path id="projects.classpath">
@@ -44,7 +44,7 @@
         <path refid="ext.classpath" />
         <pathelement location="../test/ext/testng-5.5-jdk15.jar" />
         <pathelement location="../test/ext/easymock.jar" />
-        <pathelement location="lib/felix/1.4.1/bin/felix.jar" />
+        <pathelement location="lib/felix/1.8.1/bin/felix.jar" />
         <pathelement location="lib/xstream-build/1.3/xpp3_min-1.1.4c.jar" />
     	<fileset dir="../test/ext/commons">
             <include name="*.jar" />
@@ -375,15 +375,6 @@
             privatepackage="org.apache.ace.client.repositoryuseradmin.impl, org.apache.ace.client.repository,
org.apache.ace.repository.impl, org.apache.ace.repository.ext"
             bundleactivator="org.apache.ace.client.repositoryuseradmin.impl.Activator" />
         <project-bundle 
-            bundlename="JavaMail MailService"
-            bundlesymbolicname="org.apache.ace.mailservice.javamail"
-            exportpackage="org.apache.ace.mailservice"
-            importpackage="org.apache.ace.mailservice, *;resolution:=optional"
-            privatepackage="org.apache.ace.mailservice.javamail"
-            bundleactivator="org.apache.ace.mailservice.javamail.Activator"
-        	includeresource="ext/mail.jar, lib/activation.jar"
-        	bundleclasspath="mail.jar, activation.jar, ." />
-        <project-bundle 
             bundlename="Server Action Interfaces"
             bundlesymbolicname="org.apache.ace.server.action"
             exportpackage="org.apache.ace.server.action" />
@@ -610,8 +601,8 @@
             file:bundle/http.jetty.jar
             file:bundle/org.osgi.compendium.jar 
             file:bundle/osgi.mobile.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             file:bundle/org.apache.ace.consolelogger-1.0.0.jar
@@ -634,8 +625,8 @@
             file:bundle/javax.servlet.jar 
             file:bundle/http.jetty.jar
             file:bundle/org.osgi.compendium.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             file:bundle/org.apache.felix.configadmin.jar 
@@ -649,8 +640,8 @@
             file:bundle/osgi.mobile.jar 
             file:bundle/javax.servlet.jar 
             file:bundle/http.jetty.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             file:bundle/org.apache.felix.configadmin.jar 
@@ -672,8 +663,8 @@
             file:bundle/org.osgi.compendium.jar 
             file:bundle/javax.servlet.jar 
             file:bundle/http.jetty.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             file:bundle/org.apache.felix.configadmin.jar
@@ -689,8 +680,8 @@
             file:bundle/org.osgi.compendium.jar 
             file:bundle/javax.servlet.jar 
             file:bundle/http.jetty.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             file:bundle/org.apache.felix.configadmin.jar
@@ -725,8 +716,8 @@
             file:bundle/osgi.mobile.jar 
             file:bundle/javax.servlet.jar 
             file:bundle/http.jetty.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
         	file:bundle/org.apache.felix.prefs.jar
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
@@ -800,7 +791,7 @@
                 <pathelement location="../test/classes" />
                 <pathelement location="../gateway/classes" />
                 <pathelement location="../server/classes" />
-                <pathelement location="lib/felix/1.4.1/bin/felix.jar" />
+                <pathelement location="lib/felix/1.8.1/bin/felix.jar" />
                 <pathelement location="lib/xstream-build/1.3/xpp3_min-1.1.4c.jar" />
                 <pathelement location="../test/ext/easymock.jar" />
             </classpath>

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/bin/felix.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/bin/felix.jar?rev=790841&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/bin/felix.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.bundlerepository-1.4.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.bundlerepository-1.4.0.jar?rev=790841&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.bundlerepository-1.4.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar?rev=790841&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell-1.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell.tui-1.2.0.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell.tui-1.2.0.jar?rev=790841&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/bundle/org.apache.felix.shell.tui-1.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties?rev=790841&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties Fri Jul  3 09:57:13 2009
@@ -0,0 +1,26 @@
+# 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.
+
+#
+# Framework config properties.
+#org.osgi.framework.system.packages.extra=
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=@bundles@
+org.osgi.framework.storage=cache
+@properties@

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/config.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties?rev=790841&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties Fri Jul  3 09:57:13
2009
@@ -0,0 +1,26 @@
+# 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.
+
+#
+# Framework config properties.
+#org.osgi.framework.system.packages.extra=
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=@bundles@
+org.osgi.framework.storage=cache
+@properties@

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/dev-config.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties?rev=790841&view=auto
==============================================================================
--- incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties (added)
+++ incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties Fri Jul  3 09:57:13
2009
@@ -0,0 +1,110 @@
+# 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.
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages.extra= ${testng}, \
+ ${cobertura} 
+
+org.osgi.framework.bootdelegation=sun.*,com.sun.*
+
+felix.auto.start.1=${test-bundles}
+org.osgi.framework.storage=cache
+
+#framework.service.urlhandlers=false
+
+#
+# Bundle config properties.
+#
+
+org.osgi.service.http.port=8080
+
+#obr.shell.telnet=on
+#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
+
+#
+# TestNG 5.5
+#
+testng=com; \
+com.beust; \
+com.beust.testng; \
+org; \
+org.testng; \
+org.testng.annotations; \
+org.testng.internal; \
+org.testng.internal.annotations; \
+org.testng.internal.remote; \
+org.testng.internal.thread; \
+org.testng.internal.version; \
+org.testng.junit; \
+org.testng.log; \
+org.testng.log4testng; \
+org.testng.remote; \
+org.testng.remote.strprotocol; \
+org.testng.reporters; \
+org.testng.reporters.util; \
+org.testng.xml; \
+bsh; \
+bsh.classpath; \
+bsh.collection; \
+bsh.commands; \
+bsh.org; \
+bsh.org.objectweb; \
+bsh.org.objectweb.asm; \
+bsh.reflect; \
+bsh.servlet; \
+bsh.util; \
+bsh.util.lib; \
+com.thoughtworks; \
+com.thoughtworks.qdox; \
+com.thoughtworks.qdox.ant; \
+com.thoughtworks.qdox.directorywalker; \
+com.thoughtworks.qdox.junit; \
+com.thoughtworks.qdox.model; \
+com.thoughtworks.qdox.model.util; \
+com.thoughtworks.qdox.parser; \
+com.thoughtworks.qdox.parser.impl; \
+com.thoughtworks.qdox.parser.structs; \
+com.thoughtworks.qdox.tools; \
+version="5.5"
+
+#
+# Cobertura
+#
+cobertura=net.sourceforge; \
+net.sourceforge.cobertura; \
+net.sourceforge.cobertura.ant; \
+net.sourceforge.cobertura.check; \
+net.sourceforge.cobertura.coveragedata; \
+net.sourceforge.cobertura.instrument; \
+net.sourceforge.cobertura.javancss; \
+net.sourceforge.cobertura.merge; \
+net.sourceforge.cobertura.reporting; \
+net.sourceforge.cobertura.reporting.html.files; \
+net.sourceforge.cobertura.util; \
+org.objectweb.asm; \
+org.objectweb.asm.signature; \
+org.apache.oro; \
+org.apache.oro.io; \
+org.apache.oro.text; \
+org.apache.oro.text.regex; \
+org.apache.oro.text.awk; \
+org.apache.oro.text.perl; \
+org.apache.oro.util; \
+org.apache.log4j; \
+version="1.0"

Propchange: incubator/ace/trunk/liq/lib/felix/1.8.1/conf/test-config.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/ace/trunk/liq/target-dev-client.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-client.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-client.xml (original)
+++ incubator/ace/trunk/liq/target-dev-client.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -77,8 +77,8 @@
             file:bundle/osgi.mobile.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar
         	file:bundle/org.apache.felix.eventadmin.jar
             file:bundle/org.apache.felix.prefs.jar

Modified: incubator/ace/trunk/liq/target-dev-customlicenseclient.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-customlicenseclient.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-customlicenseclient.xml (original)
+++ incubator/ace/trunk/liq/target-dev-customlicenseclient.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -77,8 +77,8 @@
             file:bundle/osgi.mobile.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar
         	file:bundle/org.apache.felix.eventadmin.jar
             file:bundle/org.apache.felix.prefs.jar

Modified: incubator/ace/trunk/liq/target-dev-customlicenseserver.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-customlicenseserver.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-customlicenseserver.xml (original)
+++ incubator/ace/trunk/liq/target-dev-customlicenseserver.xml Fri Jul  3 09:57:13 2009
@@ -8,7 +8,7 @@
     
     <target name="deploy">
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -92,9 +92,9 @@
             file:bundle/javax.servlet.jar
         	file:bundle/useradmin_all-2.0.0.jar
         	file:bundle/org.apache.felix.eventadmin.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
         	file:bundle/org.apache.felix.configadmin.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.prefs.jar
             file:bundle/org.apache.ace.configurator-1.0.0.jar
@@ -130,8 +130,8 @@
             file:bundle/org.apache.felix.shell-1.0.1.jar 
             file:bundle/org.apache.felix.shell.tui-1.0.1.jar" />
         
-    	<copy file="lib/felix/1.4.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties"/>
-        <copy file="lib/felix/1.4.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config-noshell.properties"/>
+    	<copy file="lib/felix/1.8.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties"/>
+        <copy file="lib/felix/1.8.1/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config-noshell.properties"/>
     	
     	<replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="${bundles-shell}"
/>
         <replace file="${deploy-dir}/conf/config-noshell.properties" token="@bundles@"
value="${bundles-noshell}" />

Modified: incubator/ace/trunk/liq/target-dev-gateway-ma.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway-ma.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway-ma.xml (original)
+++ incubator/ace/trunk/liq/target-dev-gateway-ma.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -48,8 +48,8 @@
             file:bundle/org.apache.ace.ma-1.0.0.jar           
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.eventadmin.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar 
             file:bundle/org.apache.ace.log-1.0.0.jar" />
         <replace file="${deploy-dir}/conf/config.properties" token="@properties@" value=""
/>

Modified: incubator/ace/trunk/liq/target-dev-gateway-upnp.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway-upnp.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway-upnp.xml (original)
+++ incubator/ace/trunk/liq/target-dev-gateway-upnp.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>

Modified: incubator/ace/trunk/liq/target-dev-gateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-gateway.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-gateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-gateway.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -58,8 +58,8 @@
             file:bundle/org.apache.ace.gateway.log.store-1.0.0.jar
             file:bundle/org.apache.ace.gateway.log-1.0.0.jar
             file:bundle/org.apache.felix.eventadmin.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar 
             file:bundle/org.apache.ace.log-1.0.0.jar
             file:bundle/org.apache.ace.configurator-1.0.0.jar

Modified: incubator/ace/trunk/liq/target-dev-licensedgateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-licensedgateway.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-licensedgateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-licensedgateway.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -72,8 +72,8 @@
             file:bundle/org.apache.ace.gateway.log.store-1.0.0.jar
             file:bundle/org.apache.ace.gateway.log-1.0.0.jar
             file:bundle/org.apache.felix.eventadmin.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar
             file:bundle/org.apache.ace.http.listener-1.0.0.jar
             file:bundle/http.jetty.jar 

Modified: incubator/ace/trunk/liq/target-dev-multigateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-multigateway.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-multigateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-multigateway.xml Fri Jul  3 09:57:13 2009
@@ -8,7 +8,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="bin/felix.jar" />
                 <include name="conf/config.properties"/>
             </fileset>

Modified: incubator/ace/trunk/liq/target-dev-obr.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obr.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obr.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obr.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -48,8 +48,8 @@
             file:bundle/org.osgi.compendium.jar 
             file:bundle/http.jetty.jar
             file:bundle/javax.servlet.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.ace.http.listener-1.0.0.jar

Modified: incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-gateway.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -60,8 +60,8 @@
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.ace.gateway.log.store-1.0.0.jar
             file:bundle/org.apache.felix.eventadmin.jar
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar 
             file:bundle/org.apache.ace.log-1.0.0.jar
             file:bundle/org.apache.ace.configurator-1.0.0.jar

Modified: incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml (original)
+++ incubator/ace/trunk/liq/target-dev-obrdeployed-obr.xml Fri Jul  3 09:57:13 2009
@@ -9,7 +9,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -57,8 +57,8 @@
             file:bundle/org.osgi.compendium.jar 
             file:bundle/http.jetty.jar
             file:bundle/javax.servlet.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.ace.http.listener-1.0.0.jar

Modified: incubator/ace/trunk/liq/target-dev-relay.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-relay.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-relay.xml (original)
+++ incubator/ace/trunk/liq/target-dev-relay.xml Fri Jul  3 09:57:13 2009
@@ -10,7 +10,7 @@
         <mkdir dir="${deploy-dir}" />
         <mkdir dir="${deploy-dir}/store" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -56,8 +56,8 @@
             file:bundle/org.osgi.compendium.jar 
             file:bundle/http.jetty.jar
             file:bundle/javax.servlet.jar 
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar 
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar 
             file:bundle/org.apache.felix.configadmin.jar 
             file:bundle/org.apache.felix.dependencymanager.jar 
             file:bundle/org.apache.felix.prefs.jar

Modified: incubator/ace/trunk/liq/target-dev-server-upnp.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-server-upnp.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-server-upnp.xml (original)
+++ incubator/ace/trunk/liq/target-dev-server-upnp.xml Fri Jul  3 09:57:13 2009
@@ -10,7 +10,7 @@
         <mkdir dir="${deploy-dir}" />
         <mkdir dir="${deploy-dir}/store" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>

Modified: incubator/ace/trunk/liq/target-dev-server.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-dev-server.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-dev-server.xml (original)
+++ incubator/ace/trunk/liq/target-dev-server.xml Fri Jul  3 09:57:13 2009
@@ -10,7 +10,7 @@
         <mkdir dir="${deploy-dir}" />
         <mkdir dir="${deploy-dir}/store" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>
@@ -107,8 +107,8 @@
             file:bundle/org.apache.ace.client.repository.helper.license-1.0.0.jar
             " />
         <property name="bundles-shell" value="${bundles-noshell}
-            file:bundle/org.apache.felix.shell-1.0.2.jar 
-            file:bundle/org.apache.felix.shell.tui-1.0.2.jar
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar
             file:bundle/org.apache.felix.dependencymanager.shell.jar 
             " />
         <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="${bundles-shell}"
/>

Modified: incubator/ace/trunk/liq/target-test.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/liq/target-test.xml?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/liq/target-test.xml (original)
+++ incubator/ace/trunk/liq/target-test.xml Fri Jul  3 09:57:13 2009
@@ -8,7 +8,7 @@
     <target name="deploy">
         <mkdir dir="${deploy-dir}" />
         <copy todir="${deploy-dir}">
-            <fileset dir="lib/felix/1.4.1">
+            <fileset dir="lib/felix/1.8.1">
                 <include name="**" />
             </fileset>
         </copy>

Modified: incubator/ace/trunk/test/.classpath
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/.classpath?rev=790841&r1=790840&r2=790841&view=diff
==============================================================================
--- incubator/ace/trunk/test/.classpath (original)
+++ incubator/ace/trunk/test/.classpath Fri Jul  3 09:57:13 2009
@@ -8,7 +8,7 @@
 	<classpathentry kind="lib" path="ext/commons/commons-cli-1.1.jar"/>
 	<classpathentry kind="lib" path="ext/easymock.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/liq"/>
-	<classpathentry kind="lib" path="/liq/lib/felix/1.4.1/bin/felix.jar" sourcepath="/Users/marcel/dev/felix/framework/src/main/java"/>
 	<classpathentry kind="lib" path="/liq/lib/xstream-build/1.3/xpp3_min-1.1.4c.jar"/>
+	<classpathentry kind="lib" path="/liq/lib/felix/1.8.1/bin/felix.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>



Mime
View raw message