| 1 |
tomwij 13/10/02 22:13:23 |
| 2 |
|
| 3 |
Added: |
| 4 |
felix-gogo-runtime-0.10.0-event-properties-to-map.patch |
| 5 |
felix-gogo-runtime-0.10.0-build.xml |
| 6 |
Log: |
| 7 |
New package for dev-java/felix-gogo-runtime, Felix Gogo Runtime. Indirect dependency needed for Struts 2. |
| 8 |
|
| 9 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-event-properties-to-map.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: felix-gogo-runtime-0.10.0-event-properties-to-map.patch |
| 18 |
=================================================================== |
| 19 |
--- src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java 2013-05-13 13:40:57.071766332 +0200 |
| 20 |
+++ src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java.2 2013-05-13 13:41:30.725096685 +0200 |
| 21 |
@@ -18,7 +18,7 @@ |
| 22 |
*/ |
| 23 |
package org.apache.felix.gogo.runtime.activator; |
| 24 |
|
| 25 |
-import java.util.Properties; |
| 26 |
+import java.util.HashMap; |
| 27 |
|
| 28 |
import org.apache.felix.gogo.api.CommandSessionListener; |
| 29 |
import org.apache.felix.service.command.CommandSession; |
| 30 |
@@ -43,8 +43,8 @@ |
| 31 |
public void beforeExecute(CommandSession session, CharSequence command) { |
| 32 |
EventAdmin admin = (EventAdmin) tracker.getService(); |
| 33 |
if (admin != null) { |
| 34 |
- Properties props = new Properties(); |
| 35 |
- props.setProperty("command", command.toString()); |
| 36 |
+ HashMap<String, String> props = new HashMap<String, String>(); |
| 37 |
+ props.put(new String("command"), command.toString()); |
| 38 |
Event event = new Event("org/apache/felix/service/command/EXECUTING", props); |
| 39 |
admin.postEvent(event); |
| 40 |
} |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/felix-gogo-runtime/files/felix-gogo-runtime-0.10.0-build.xml?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: felix-gogo-runtime-0.10.0-build.xml |
| 50 |
=================================================================== |
| 51 |
<?xml version="1.0" encoding="UTF-8"?> |
| 52 |
|
| 53 |
<!-- ====================================================================== --> |
| 54 |
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> |
| 55 |
<!-- ====================================================================== --> |
| 56 |
|
| 57 |
<!-- ====================================================================== --> |
| 58 |
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> |
| 59 |
<!-- ====================================================================== --> |
| 60 |
<!-- --> |
| 61 |
<!-- Any modifications will be overwritten. --> |
| 62 |
<!-- --> |
| 63 |
<!-- Generated by Maven Ant Plugin on 5/13/13 1:33 PM --> |
| 64 |
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> |
| 65 |
<!-- --> |
| 66 |
<!-- ====================================================================== --> |
| 67 |
|
| 68 |
<project name="org.apache.felix.gogo.runtime-from-maven" default="package" basedir="."> |
| 69 |
|
| 70 |
<!-- ====================================================================== --> |
| 71 |
<!-- Build environment properties --> |
| 72 |
<!-- ====================================================================== --> |
| 73 |
|
| 74 |
<property file="${user.home}/.m2/maven.properties"/> |
| 75 |
<property file="maven-build.properties"/> |
| 76 |
|
| 77 |
<property name="maven.build.finalName" value="org.apache.felix.gogo.runtime-0.10.0"/> |
| 78 |
<property name="maven.build.dir" value="target"/> |
| 79 |
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> |
| 80 |
<property name="maven.build.srcDir.0" value="src/main/java"/> |
| 81 |
<property name="maven.build.resourceDir.0" value="src/main/resources"/> |
| 82 |
<property name="maven.build.resourceDir.1" value="."/> |
| 83 |
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> |
| 84 |
<property name="maven.build.testDir.0" value="src/test/java"/> |
| 85 |
<property name="maven.build.testResourceDir.0" value="src/test/resources"/> |
| 86 |
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> |
| 87 |
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> |
| 88 |
|
| 89 |
<property name="maven.repo.local" value="${user.home}/.m2/repository"/> |
| 90 |
<property name="maven.settings.offline" value="false"/> |
| 91 |
<property name="maven.settings.interactiveMode" value="true"/> |
| 92 |
|
| 93 |
<!-- ====================================================================== --> |
| 94 |
<!-- Defining classpaths --> |
| 95 |
<!-- ====================================================================== --> |
| 96 |
|
| 97 |
<path id="build.classpath"> |
| 98 |
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/> |
| 99 |
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/> |
| 100 |
</path> |
| 101 |
<path id="build.test.classpath"> |
| 102 |
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar"/> |
| 103 |
<pathelement location="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar"/> |
| 104 |
<pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/> |
| 105 |
<pathelement location="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar"/> |
| 106 |
<pathelement location="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar"/> |
| 107 |
</path> |
| 108 |
|
| 109 |
<!-- ====================================================================== --> |
| 110 |
<!-- Cleaning up target --> |
| 111 |
<!-- ====================================================================== --> |
| 112 |
|
| 113 |
<target name="clean" description="Clean the output directory"> |
| 114 |
<delete dir="${maven.build.dir}"/> |
| 115 |
</target> |
| 116 |
|
| 117 |
<!-- ====================================================================== --> |
| 118 |
<!-- Compilation target --> |
| 119 |
<!-- ====================================================================== --> |
| 120 |
|
| 121 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 122 |
<mkdir dir="${maven.build.outputDir}"/> |
| 123 |
<javac destdir="${maven.build.outputDir}" |
| 124 |
nowarn="false" |
| 125 |
debug="true" |
| 126 |
optimize="false" |
| 127 |
deprecation="true" |
| 128 |
target="1.5" |
| 129 |
verbose="false" |
| 130 |
fork="false" |
| 131 |
source="1.5"> |
| 132 |
<src> |
| 133 |
<pathelement location="${maven.build.srcDir.0}"/> |
| 134 |
</src> |
| 135 |
<classpath refid="build.classpath"/> |
| 136 |
</javac> |
| 137 |
<mkdir dir="${maven.build.outputDir}/META-INF"/> |
| 138 |
<copy todir="${maven.build.outputDir}/META-INF"> |
| 139 |
<fileset dir="${maven.build.resourceDir.1}"> |
| 140 |
<include name="LICENSE*"/> |
| 141 |
<include name="NOTICE*"/> |
| 142 |
</fileset> |
| 143 |
</copy> |
| 144 |
</target> |
| 145 |
|
| 146 |
<!-- ====================================================================== --> |
| 147 |
<!-- Test-compilation target --> |
| 148 |
<!-- ====================================================================== --> |
| 149 |
|
| 150 |
<target name="compile-tests" |
| 151 |
depends="compile" |
| 152 |
description="Compile the test code" |
| 153 |
unless="maven.test.skip"> |
| 154 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 155 |
<javac destdir="${maven.build.testOutputDir}" |
| 156 |
nowarn="false" |
| 157 |
debug="true" |
| 158 |
optimize="false" |
| 159 |
deprecation="true" |
| 160 |
target="1.5" |
| 161 |
verbose="false" |
| 162 |
fork="false" |
| 163 |
source="1.5"> |
| 164 |
<src> |
| 165 |
<pathelement location="${maven.build.testDir.0}"/> |
| 166 |
</src> |
| 167 |
<classpath> |
| 168 |
<path refid="build.test.classpath"/> |
| 169 |
<pathelement location="${maven.build.outputDir}"/> |
| 170 |
</classpath> |
| 171 |
</javac> |
| 172 |
</target> |
| 173 |
|
| 174 |
<!-- ====================================================================== --> |
| 175 |
<!-- Run all tests --> |
| 176 |
<!-- ====================================================================== --> |
| 177 |
|
| 178 |
<target name="test" |
| 179 |
depends="compile-tests, junit-missing" |
| 180 |
unless="junit.skipped" |
| 181 |
description="Run the test cases"> |
| 182 |
<mkdir dir="${maven.test.reports}"/> |
| 183 |
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> |
| 184 |
<sysproperty key="basedir" value="."/> |
| 185 |
<formatter type="xml"/> |
| 186 |
<formatter type="plain" usefile="false"/> |
| 187 |
<classpath> |
| 188 |
<path refid="build.test.classpath"/> |
| 189 |
<pathelement location="${maven.build.outputDir}"/> |
| 190 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 191 |
</classpath> |
| 192 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 193 |
<fileset dir="${maven.build.testDir.0}"> |
| 194 |
<include name="**/Test*.java"/> |
| 195 |
<include name="**/*Test.java"/> |
| 196 |
<include name="**/*TestCase.java"/> |
| 197 |
<exclude name="**/*Abstract*Test.java"/> |
| 198 |
</fileset> |
| 199 |
</batchtest> |
| 200 |
<batchtest todir="${maven.test.reports}" if="test"> |
| 201 |
<fileset dir="${maven.build.testDir.0}"> |
| 202 |
<include name="**/${test}.java"/> |
| 203 |
<exclude name="**/*Abstract*Test.java"/> |
| 204 |
</fileset> |
| 205 |
</batchtest> |
| 206 |
</junit> |
| 207 |
</target> |
| 208 |
|
| 209 |
<target name="test-junit-present"> |
| 210 |
<available classname="junit.framework.Test" property="junit.present"/> |
| 211 |
</target> |
| 212 |
|
| 213 |
<target name="test-junit-status" |
| 214 |
depends="test-junit-present"> |
| 215 |
<condition property="junit.missing"> |
| 216 |
<and> |
| 217 |
<isfalse value="${junit.present}"/> |
| 218 |
<isfalse value="${maven.test.skip}"/> |
| 219 |
</and> |
| 220 |
</condition> |
| 221 |
<condition property="junit.skipped"> |
| 222 |
<or> |
| 223 |
<isfalse value="${junit.present}"/> |
| 224 |
<istrue value="${maven.test.skip}"/> |
| 225 |
</or> |
| 226 |
</condition> |
| 227 |
</target> |
| 228 |
|
| 229 |
<target name="junit-missing" |
| 230 |
depends="test-junit-status" |
| 231 |
if="junit.missing"> |
| 232 |
<echo>=================================== WARNING ===================================</echo> |
| 233 |
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> |
| 234 |
<echo>===============================================================================</echo> |
| 235 |
</target> |
| 236 |
|
| 237 |
<!-- ====================================================================== --> |
| 238 |
<!-- Javadoc target --> |
| 239 |
<!-- ====================================================================== --> |
| 240 |
|
| 241 |
<target name="javadoc" description="Generates the Javadoc of the application"> |
| 242 |
<javadoc sourcepath="${maven.build.srcDir.0}" |
| 243 |
packagenames="*" |
| 244 |
destdir="${maven.reporting.outputDirectory}/apidocs" |
| 245 |
access="protected" |
| 246 |
old="false" |
| 247 |
verbose="false" |
| 248 |
version="true" |
| 249 |
use="true" |
| 250 |
author="true" |
| 251 |
splitindex="false" |
| 252 |
nodeprecated="false" |
| 253 |
nodeprecatedlist="false" |
| 254 |
notree="false" |
| 255 |
noindex="false" |
| 256 |
nohelp="false" |
| 257 |
nonavbar="false" |
| 258 |
serialwarn="false" |
| 259 |
charset="ISO-8859-1" |
| 260 |
linksource="false" |
| 261 |
breakiterator="false"/> |
| 262 |
</target> |
| 263 |
|
| 264 |
<!-- ====================================================================== --> |
| 265 |
<!-- Package target --> |
| 266 |
<!-- ====================================================================== --> |
| 267 |
|
| 268 |
<target name="package" depends="compile,test" description="Package the application"> |
| 269 |
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" |
| 270 |
compress="true" |
| 271 |
index="false" |
| 272 |
basedir="${maven.build.outputDir}" |
| 273 |
excludes="**/package.html"/> |
| 274 |
</target> |
| 275 |
|
| 276 |
<!-- ====================================================================== --> |
| 277 |
<!-- A dummy target for the package named after the type it creates --> |
| 278 |
<!-- ====================================================================== --> |
| 279 |
|
| 280 |
<target name="jar" depends="package" description="Builds the jar for the application"/> |
| 281 |
|
| 282 |
<!-- ====================================================================== --> |
| 283 |
<!-- Download dependencies target --> |
| 284 |
<!-- ====================================================================== --> |
| 285 |
|
| 286 |
<target name="test-offline"> |
| 287 |
<condition property="maven.mode.offline"> |
| 288 |
<equals arg1="${maven.settings.offline}" arg2="true"/> |
| 289 |
</condition> |
| 290 |
</target> |
| 291 |
|
| 292 |
<target name="get-deps" |
| 293 |
depends="test-offline" |
| 294 |
description="Download all dependencies" |
| 295 |
unless="maven.mode.offline"> |
| 296 |
<mkdir dir="${maven.repo.local}"/> |
| 297 |
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0"/> |
| 298 |
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" |
| 299 |
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" |
| 300 |
usetimestamp="false" |
| 301 |
ignoreerrors="true"/> |
| 302 |
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" |
| 303 |
dest="${maven.repo.local}/org/osgi/org.osgi.core/4.0.0/org.osgi.core-4.0.0.jar" |
| 304 |
usetimestamp="false" |
| 305 |
ignoreerrors="true"/> |
| 306 |
<mkdir dir="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0"/> |
| 307 |
<get src="http://repository.apache.org/snapshots/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" |
| 308 |
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" |
| 309 |
usetimestamp="false" |
| 310 |
ignoreerrors="true"/> |
| 311 |
<get src="http://repo.maven.apache.org/maven2/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" |
| 312 |
dest="${maven.repo.local}/org/osgi/org.osgi.compendium/4.0.0/org.osgi.compendium-4.0.0.jar" |
| 313 |
usetimestamp="false" |
| 314 |
ignoreerrors="true"/> |
| 315 |
<mkdir dir="${maven.repo.local}/junit/junit/4.5"/> |
| 316 |
<get src="http://repository.apache.org/snapshots/junit/junit/4.5/junit-4.5.jar" |
| 317 |
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" |
| 318 |
usetimestamp="false" |
| 319 |
ignoreerrors="true"/> |
| 320 |
<get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar" |
| 321 |
dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" |
| 322 |
usetimestamp="false" |
| 323 |
ignoreerrors="true"/> |
| 324 |
<mkdir dir="${maven.repo.local}/org/easymock/easymock/2.4"/> |
| 325 |
<get src="http://repository.apache.org/snapshots/org/easymock/easymock/2.4/easymock-2.4.jar" |
| 326 |
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" |
| 327 |
usetimestamp="false" |
| 328 |
ignoreerrors="true"/> |
| 329 |
<get src="http://repo.maven.apache.org/maven2/org/easymock/easymock/2.4/easymock-2.4.jar" |
| 330 |
dest="${maven.repo.local}/org/easymock/easymock/2.4/easymock-2.4.jar" |
| 331 |
usetimestamp="false" |
| 332 |
ignoreerrors="true"/> |
| 333 |
<mkdir dir="${maven.repo.local}/org/mockito/mockito-all/1.7"/> |
| 334 |
<get src="http://repository.apache.org/snapshots/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" |
| 335 |
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" |
| 336 |
usetimestamp="false" |
| 337 |
ignoreerrors="true"/> |
| 338 |
<get src="http://repo.maven.apache.org/maven2/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" |
| 339 |
dest="${maven.repo.local}/org/mockito/mockito-all/1.7/mockito-all-1.7.jar" |
| 340 |
usetimestamp="false" |
| 341 |
ignoreerrors="true"/> |
| 342 |
</target> |
| 343 |
|
| 344 |
</project> |
Archives