You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2016/01/29 12:13:39 UTC
svn commit: r1727534 - in /ace/trunk/run-server-allinone/scripts:
felixHttpConf.xml test_autoconf.gogo
Author: jawi
Date: Fri Jan 29 11:13:39 2016
New Revision: 1727534
URL: http://svn.apache.org/viewvc?rev=1727534&view=rev
Log:
Added extra test script:
- allows you to set up everything to test the AutoConf resource processor with
property replacement by means of tags on the target.
Added:
ace/trunk/run-server-allinone/scripts/felixHttpConf.xml (with props)
ace/trunk/run-server-allinone/scripts/test_autoconf.gogo
Added: ace/trunk/run-server-allinone/scripts/felixHttpConf.xml
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/felixHttpConf.xml?rev=1727534&view=auto
==============================================================================
--- ace/trunk/run-server-allinone/scripts/felixHttpConf.xml (added)
+++ ace/trunk/run-server-allinone/scripts/felixHttpConf.xml Fri Jan 29 11:13:39 2016
@@ -0,0 +1,33 @@
+<?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.
+-->
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.2.0">
+ <OCD name="Apache Felix Http Config" id="org.osgi.service.http">
+ <AD id="org.osgi.service.http.port" type="STRING" cardinality="0" />
+ </OCD>
+ <!-- AutoConf requires the BSN of the bundle for which this configuration is meant to be provided! -->
+ <Designate pid="org.apache.felix.http" bundle="osgi-dp:org.apache.felix.http.jetty">
+ <Object ocdref="org.osgi.service.http">
+ <Attribute adref="org.osgi.service.http.port">
+ <!-- ACE requires the `context.` prefix! -->
+ <Value>${context.httpPort}</Value>
+ </Attribute>
+ </Object>
+ </Designate>
+</metatype:MetaData>
Propchange: ace/trunk/run-server-allinone/scripts/felixHttpConf.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ace/trunk/run-server-allinone/scripts/felixHttpConf.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ace/trunk/run-server-allinone/scripts/test_autoconf.gogo
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/test_autoconf.gogo?rev=1727534&view=auto
==============================================================================
--- ace/trunk/run-server-allinone/scripts/test_autoconf.gogo (added)
+++ ace/trunk/run-server-allinone/scripts/test_autoconf.gogo Fri Jan 29 11:13:39 2016
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
+
+# install test bundle with additional Gogo commands needed later on in this script
+pwd = (cd) getAbsolutePath
+
+#start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
+
+# create a workspace
+w = (cw)
+
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.8.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.metatype/org.apache.felix.metatype-1.1.2.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.1.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.4.6.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.log/org.apache.felix.log-1.0.1.jar' true
+
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.12.0.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.2.jar' true
+
+
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.8.jar' true
+
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-3.1.6.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.http.servlet-api/org.apache.felix.http.servlet-api-1.1.2.jar' true
+$w ca 'file:'$pwd'/scripts/felixHttpConf.xml' true
+
+$w cf 'autoconf-deps'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.configadmin)' '(name=autoconf-deps)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.metatype)' '(name=autoconf-deps)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.dependencymanager)' '(name=autoconf-deps)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.eventadmin)' '(name=autoconf-deps)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.log)' '(name=autoconf-deps)'
+$w ca2f '(artifactName=felixHttpConf.xml)' '(name=autoconf-deps)'
+
+$w cf 'shell'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.gogo.command)' '(name=shell)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.gogo.runtime)' '(name=shell)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.gogo.shell)' '(name=shell)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.dependencymanager.shell)' '(name=shell)'
+
+$w cf 'http'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.http.jetty)' '(name=http)'
+$w ca2f '(Bundle-SymbolicName=org.apache.felix.http.servlet-api)' '(name=http)'
+
+
+$w cd 'autoconf-test'
+
+
+$w cf2d '(name=autoconf-deps)' '(name=autoconf-test)'
+$w cf2d '(name=shell)' '(name=autoconf-test)'
+$w cf2d '(name=http)' '(name=autoconf-test)'
+
+
+($w ct [id=target-1] [httpPort="8888"]) setautoapprove true
+$w cd2t '(name=autoconf-test)' '(id=target-1)'
+
+
+# commit and delete the workspace
+$w commit
+rw $w
\ No newline at end of file