You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/12/03 00:54:22 UTC
svn commit: r1209785 [3/3] - in /karaf/trunk: ./ assemblies/apache-karaf/
assemblies/features/enterprise/src/main/feature/
assemblies/features/framework/
assemblies/features/framework/src/main/feature/
assemblies/features/framework/src/main/filtered-re...
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,195 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+
+package org.apache.karaf.region.persist.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for filterType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="filterType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="bundle" type="{http://karaf.apache.org/xmlns/region/v1.0.0}filterBundleType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="package" type="{http://karaf.apache.org/xmlns/region/v1.0.0}filterPackageType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="namespace" type="{http://karaf.apache.org/xmlns/region/v1.0.0}filterNamespaceType" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "filterType", propOrder = {
+ "bundle",
+ "_package",
+ "namespace"
+})
+public class FilterType {
+
+ protected List<FilterBundleType> bundle;
+ @XmlElement(name = "package")
+ protected List<FilterPackageType> _package;
+ protected List<FilterNamespaceType> namespace;
+ @XmlAttribute(required = true)
+ protected String from;
+ @XmlAttribute(required = true)
+ protected String to;
+
+ /**
+ * Gets the value of the bundle property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the bundle property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getBundle().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link FilterBundleType }
+ *
+ *
+ */
+ public List<FilterBundleType> getBundle() {
+ if (bundle == null) {
+ bundle = new ArrayList<FilterBundleType>();
+ }
+ return this.bundle;
+ }
+
+ /**
+ * Gets the value of the package property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the package property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getPackage().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link FilterPackageType }
+ *
+ *
+ */
+ public List<FilterPackageType> getPackage() {
+ if (_package == null) {
+ _package = new ArrayList<FilterPackageType>();
+ }
+ return this._package;
+ }
+
+ /**
+ * Gets the value of the namespace property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the namespace property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getNamespace().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link FilterNamespaceType }
+ *
+ *
+ */
+ public List<FilterNamespaceType> getNamespace() {
+ if (namespace == null) {
+ namespace = new ArrayList<FilterNamespaceType>();
+ }
+ return this.namespace;
+ }
+
+ /**
+ * Gets the value of the from property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFrom() {
+ return from;
+ }
+
+ /**
+ * Sets the value of the from property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFrom(String value) {
+ this.from = value;
+ }
+
+ /**
+ * Gets the value of the to property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTo() {
+ return to;
+ }
+
+ /**
+ * Sets the value of the to property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTo(String value) {
+ this.to = value;
+ }
+
+}
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/FilterType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,116 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+
+package org.apache.karaf.region.persist.model;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.apache.karaf.region.persist.model package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _Regions_QNAME = new QName("http://karaf.apache.org/xmlns/region/v1.0.0", "regions");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.karaf.region.persist.model
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link FilterNamespaceType }
+ *
+ */
+ public FilterNamespaceType createFilterNamespaceType() {
+ return new FilterNamespaceType();
+ }
+
+ /**
+ * Create an instance of {@link FilterType }
+ *
+ */
+ public FilterType createFilterType() {
+ return new FilterType();
+ }
+
+ /**
+ * Create an instance of {@link RegionBundleType }
+ *
+ */
+ public RegionBundleType createRegionBundleType() {
+ return new RegionBundleType();
+ }
+
+ /**
+ * Create an instance of {@link FilterBundleType }
+ *
+ */
+ public FilterBundleType createFilterBundleType() {
+ return new FilterBundleType();
+ }
+
+ /**
+ * Create an instance of {@link FilterPackageType }
+ *
+ */
+ public FilterPackageType createFilterPackageType() {
+ return new FilterPackageType();
+ }
+
+ /**
+ * Create an instance of {@link FilterAttributeType }
+ *
+ */
+ public FilterAttributeType createFilterAttributeType() {
+ return new FilterAttributeType();
+ }
+
+ /**
+ * Create an instance of {@link RegionType }
+ *
+ */
+ public RegionType createRegionType() {
+ return new RegionType();
+ }
+
+ /**
+ * Create an instance of {@link RegionsType }
+ *
+ */
+ public RegionsType createRegionsType() {
+ return new RegionsType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RegionsType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://karaf.apache.org/xmlns/region/v1.0.0", name = "regions")
+ public JAXBElement<RegionsType> createRegions(RegionsType value) {
+ return new JAXBElement<RegionsType>(_Regions_QNAME, RegionsType.class, null, value);
+ }
+
+}
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/ObjectFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+
+package org.apache.karaf.region.persist.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for regionBundleType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="regionBundleType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}long" />
+ * <attribute name="location" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "regionBundleType")
+public class RegionBundleType {
+
+ @XmlAttribute
+ protected Long id;
+ @XmlAttribute
+ protected String location;
+
+ /**
+ * Gets the value of the id property.
+ *
+ * @return
+ * possible object is
+ * {@link Long }
+ *
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Long }
+ *
+ */
+ public void setId(Long value) {
+ this.id = value;
+ }
+
+ /**
+ * Gets the value of the location property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getLocation() {
+ return location;
+ }
+
+ /**
+ * Sets the value of the location property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setLocation(String value) {
+ this.location = value;
+ }
+
+}
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionBundleType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,106 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+
+package org.apache.karaf.region.persist.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * Regions element
+ *
+ *
+ * <p>Java class for regionType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="regionType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="bundle" type="{http://karaf.apache.org/xmlns/region/v1.0.0}regionBundleType" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "regionType", propOrder = {
+ "bundle"
+})
+public class RegionType {
+
+ protected List<RegionBundleType> bundle;
+ @XmlAttribute(required = true)
+ protected String name;
+
+ /**
+ * Gets the value of the bundle property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the bundle property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getBundle().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link RegionBundleType }
+ *
+ *
+ */
+ public List<RegionBundleType> getBundle() {
+ if (bundle == null) {
+ bundle = new ArrayList<RegionBundleType>();
+ }
+ return this.bundle;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+}
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,112 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+
+package org.apache.karaf.region.persist.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
+ * Regions element
+ *
+ *
+ * <p>Java class for regionsType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="regionsType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="region" type="{http://karaf.apache.org/xmlns/region/v1.0.0}regionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="filter" type="{http://karaf.apache.org/xmlns/region/v1.0.0}filterType" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlRootElement(name = "regions")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "regionsType", propOrder = {
+ "region",
+ "filter"
+})
+public class RegionsType {
+
+ protected List<RegionType> region;
+ protected List<FilterType> filter;
+
+ /**
+ * Gets the value of the region property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the region property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getRegion().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link RegionType }
+ *
+ *
+ */
+ public List<RegionType> getRegion() {
+ if (region == null) {
+ region = new ArrayList<RegionType>();
+ }
+ return this.region;
+ }
+
+ /**
+ * Gets the value of the filter property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the filter property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getFilter().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link FilterType }
+ *
+ *
+ */
+ public List<FilterType> getFilter() {
+ if (filter == null) {
+ filter = new ArrayList<FilterType>();
+ }
+ return this.filter;
+ }
+
+}
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/RegionsType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java (added)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java Fri Dec 2 23:54:19 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.10.28 at 03:20:55 PM PDT
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://karaf.apache.org/xmlns/region/v1.0.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.karaf.region.persist.model;
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/model/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd (added)
+++ karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd Fri Dec 2 23:54:19 2011
@@ -0,0 +1,109 @@
+<?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.
+-->
+
+<!-- $Rev: 699828 $ $Date: 2008-09-28 16:35:27 +0200 (Sun, 28 Sep 2008) $ -->
+
+<xsd:schema xmlns="http://karaf.apache.org/xmlns/region/v1.0.0"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://karaf.apache.org/xmlns/region/v1.0.0"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+
+
+ <xsd:annotation>
+ <xsd:documentation>
+ Defines the configuration elements for Apache Karaf region xml configuration.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:element name="regions" type="regionsType"/>
+
+
+ <xsd:complexType name="regionsType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Regions element
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="region" type="regionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="filter" type="filterType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="regionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Region element
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="bundle" type="regionBundleType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+
+ <xsd:complexType name="regionBundleType">
+ <xsd:sequence/>
+ <xsd:attribute name="id" type="xsd:long"/>
+ <xsd:attribute name="location" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterBundleType">
+ <xsd:sequence>
+ <xsd:element name="attribute" type="filterAttributeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:long"/>
+ <xsd:attribute name="symbolic-name" type="xsd:string"/>
+ <xsd:attribute name="version" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterType">
+ <xsd:sequence>
+ <xsd:element name="bundle" type="filterBundleType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="package" type="filterPackageType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="namespace" type="filterNamespaceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="from" type="xsd:string" use="required"/>
+ <xsd:attribute name="to" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterPackageType">
+ <xsd:sequence>
+ <xsd:element name="attribute" type="filterAttributeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="version" type="xsd:string"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterAttributeType">
+ <xsd:sequence/>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="value" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="filterNamespaceType">
+ <xsd:sequence>
+ <xsd:element name="attribute" type="filterAttributeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+</xsd:schema>
Propchange: karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/persist/src/main/resources/org/apache/karaf/region/persist/region.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: karaf/trunk/region/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/pom.xml?rev=1209785&view=auto
==============================================================================
--- karaf/trunk/region/pom.xml (added)
+++ karaf/trunk/region/pom.xml Fri Dec 2 23:54:19 2011
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>region</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Region</name>
+
+ <modules>
+ <module>commands</module>
+ <module>persist</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>commands</module>
+ <module>persist</module>
+ </modules>
+
+ </profile>
+
+ <profile>
+ <id>fetch-external</id>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>ossrh</id>
+ <name>Sonatype OSS Repository</name>
+ <url>http://oss.sonatype.org/content/groups/public</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+
+ <build>
+ <plugins>
+
+ <!-- EXTERNAL DEPENDENCY RESOLVER -->
+
+ <plugin>
+ <groupId>com.savage7.maven.plugins</groupId>
+ <artifactId>maven-external-dependency-plugin</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <inherited>false</inherited>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ <skipChecksumVerification>false</skipChecksumVerification>
+ <force>false</force>
+ <artifactItems>
+<!-- used in aries subsystem but not here
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://www.eclipse.org/downloads/download.php?file=/equinox/drops/I20111018-0850/org.eclipse.osgi_3.8.0.v20111017-1643.jar&url=http://download.eclipse.org/equinox/drops/I20111018-0850/org.eclipse.osgi_3.8.0.v20111017-1643.jar&mirror_id=1</downloadUrl>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>coordinator</artifactId>
+ <version>1.0.0.v20110314</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.7.1-201109091335/org.eclipse.equinox.coordinator_1.0.0.v20110502.jar</downloadUrl>
+ </artifactItem>
+-->
+ <artifactItem>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>region</artifactId>
+ <version>1.0.0.v20110506</version>
+ <packaging>jar</packaging>
+ <downloadUrl>http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.7.1-201109091335/org.eclipse.equinox.region_1.0.0.v20110524.jar</downloadUrl>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clean-external-dependencies</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean-external</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>resolve-install-external-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resolve-external</goal>
+ <goal>install-external</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
Propchange: karaf/trunk/region/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/region/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/region/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java (original)
+++ karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/EditCommandTest.java Fri Dec 2 23:54:19 2011
@@ -22,6 +22,7 @@ import java.util.Properties;
import junit.framework.TestCase;
import org.apache.felix.service.command.CommandSession;
import org.easymock.EasyMock;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
@@ -42,7 +43,7 @@ public class EditCommandTest extends Tes
private BundleContext context;
private ConfigurationAdmin admin;
private CommandSession session;
-
+
@Override
protected void setUp() throws Exception {
command = new EditCommand();
@@ -55,6 +56,7 @@ public class EditCommandTest extends Tes
admin = createMock(ConfigurationAdmin.class);
expect(context.getService(reference)).andReturn(admin);
+ expect(context.getBundle(0)).andReturn(null).anyTimes();
expect(context.ungetService(reference)).andReturn(Boolean.TRUE);
replay(context);
Modified: karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java (original)
+++ karaf/trunk/shell/config/src/test/java/org/apache/karaf/shell/config/UpdateCommandTest.java Fri Dec 2 23:54:19 2011
@@ -55,6 +55,7 @@ public class UpdateCommandTest extends T
admin = createMock(ConfigurationAdmin.class);
expect(context.getService(reference)).andReturn(admin);
+ expect(context.getBundle(0)).andReturn(null).anyTimes();
expect(context.ungetService(reference)).andReturn(Boolean.TRUE);
replay(context);
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java Fri Dec 2 23:54:19 2011
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.commands.Action;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -42,7 +43,8 @@ public abstract class OsgiCommandSupport
}
public BundleContext getBundleContext() {
- return bundleContext;
+ Bundle framework = bundleContext.getBundle(0);
+ return framework == null? bundleContext: framework.getBundleContext();
}
public void setBundleContext(BundleContext bundleContext) {
Modified: karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java (original)
+++ karaf/trunk/shell/services/src/main/java/org/apache/karaf/shell/services/ListServices.java Fri Dec 2 23:54:19 2011
@@ -26,6 +26,7 @@ import org.apache.felix.service.command.
import org.apache.karaf.shell.bundles.BundleSelector;
import org.apache.karaf.util.ShellUtil;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@Command(scope = "service", name = "list", description = "Lists OSGi services.")
@@ -40,10 +41,11 @@ public class ListServices extends OsgiCo
boolean inUse;
protected Object doExecute() throws Exception {
- BundleSelector selector = new BundleSelector(getBundleContext(), session);
+ BundleContext bundleContext = getBundleContext();
+ BundleSelector selector = new BundleSelector(bundleContext, session);
List<Bundle> bundles = selector.selectBundles(ids, true);
if (bundles == null || bundles.isEmpty()) {
- Bundle[] allBundles = getBundleContext().getBundles();
+ Bundle[] allBundles = bundleContext.getBundles();
printBundles(allBundles, false);
} else {
printBundles(bundles.toArray(new Bundle[]{}), true);
Modified: karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java (original)
+++ karaf/trunk/shell/services/src/test/java/org/apache/karaf/shell/services/ListServicesTest.java Fri Dec 2 23:54:19 2011
@@ -48,6 +48,7 @@ public class ListServicesTest {
private BundleContext createBundleContext() {
BundleContext bundleContext = createMock(BundleContext.class);
Bundle[] bundles = createBundles();
+ expect(bundleContext.getBundle(0)).andReturn(null);
expect(bundleContext.getBundles()).andReturn(bundles);
expect(bundleContext.getBundle(1)).andReturn(bundles[0]);
expect(bundleContext.getBundle(2)).andReturn(bundles[1]);
Modified: karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java?rev=1209785&r1=1209784&r2=1209785&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java (original)
+++ karaf/trunk/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/ExtendedFeature.java Fri Dec 2 23:54:19 2011
@@ -45,9 +45,9 @@ public class ExtendedFeature implements
}
}
- protected State state;
- protected String repository;
- protected Feature feature;
+ protected final State state;
+ protected final String repository;
+ protected final Feature feature;
//
@@ -139,4 +139,9 @@ public class ExtendedFeature implements
public int getStartLevel() {
return 0;
}
+
+ @Override
+ public String getRegion() {
+ return feature.getRegion();
+ }
}