You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/02/25 09:33:13 UTC
svn commit: r916181 [3/3] - in /felix/trunk/bundlerepository/src:
main/java/org/apache/felix/bundlerepository/
test/java/org/apache/felix/bundlerepository/
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java Thu Feb 25 08:33:12 2010
@@ -237,7 +237,7 @@
return resources;
}
- public Requirement requirement(String name, String filter)
+ public Requirement requirement(String name, String filter) throws InvalidSyntaxException
{
RequirementImpl req = new RequirementImpl();
req.setName(name);
@@ -250,7 +250,7 @@
public Filter filter(String filter) throws InvalidSyntaxException
{
- return new FilterImpl(filter);
+ return FilterImpl.newInstance(filter);
}
public Repository repository(URL url) throws Exception
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java Thu Feb 25 08:33:12 2010
@@ -19,6 +19,7 @@
package org.apache.felix.bundlerepository;
import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.obr.Capability;
import org.osgi.service.obr.Requirement;
@@ -51,9 +52,9 @@
return m_filter.toString();
}
- public synchronized void setFilter(String filter)
+ public synchronized void setFilter(String filter) throws InvalidSyntaxException
{
- m_filter = new FilterImpl(filter);
+ m_filter = FilterImpl.newInstance(filter);
}
public synchronized boolean isSatisfied(Capability capability)
Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/FilterImplTest.java Thu Feb 25 08:33:12 2010
@@ -22,12 +22,13 @@
import java.util.Hashtable;
import junit.framework.TestCase;
+import org.osgi.framework.Version;
public class FilterImplTest extends TestCase
{
public void testStandardLDAP() throws Exception
{
- FilterImpl filterImpl = new FilterImpl(
+ FilterImpl filterImpl = FilterImpl.newInstance(
"(&(package=org.eclipse.core.runtime)(version>=0.0.0)(common=split))");
Dictionary dict = new Hashtable();
@@ -47,7 +48,7 @@
public void testNoneStandardLDAPOperators() throws Exception
{
- FilterImpl filterImpl = new FilterImpl(
+ FilterImpl filterImpl = FilterImpl.newInstance(
"(&(package=org.eclipse.core.runtime)(version>=0.0.0)(common=split)(mandatory:<*common,test))");
Dictionary dict = new Hashtable();
@@ -57,59 +58,59 @@
dict = new Hashtable();
dict.put("mandatory", "common");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
dict = new Hashtable();
dict.put("mandatory", "common,test");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
dict = new Hashtable();
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
- filterImpl = new FilterImpl(
+ filterImpl = FilterImpl.newInstance(
"(&(package=org.eclipse.core.runtime)(version>=0.0.0)(common=split)(mandatory:*>common))");
dict = new Hashtable();
dict.put("mandatory", "common");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
dict = new Hashtable();
dict.put("mandatory", "common,test");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
- filterImpl = new FilterImpl(
+ filterImpl = FilterImpl.newInstance(
"(&(package=org.eclipse.core.runtime)(version>=0.0.0)(common=split)(mandatory:*>common,test))");
dict = new Hashtable();
dict.put("mandatory", "common");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertFalse(filterImpl.match(dict));
dict = new Hashtable();
dict.put("mandatory", "common,test");
dict.put("package", "org.eclipse.core.runtime");
- dict.put("version", "0.0.0");
+ dict.put("version", new Version("0.0.0"));
dict.put("common", "split");
assertTrue(filterImpl.match(dict));
}
public void testCaseSensitive() throws Exception
{
- FilterImpl filterImpl = new FilterImpl("(&(package=org.eclipse.core.runtime))");
+ FilterImpl filterImpl = FilterImpl.newInstance("(&(package=org.eclipse.core.runtime))");
Dictionary dict = new Hashtable();
dict.put("PACKAGE", "org.eclipse.core.runtime");
@@ -119,4 +120,5 @@
dict.put("PACKAGE", "org.eclipse.core.runtime");
assertFalse(filterImpl.matchCase(dict));
}
+
}
\ No newline at end of file
Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/RepositoryAdminTest.java Thu Feb 25 08:33:12 2010
@@ -68,7 +68,7 @@
final Capture c = new Capture();
EasyMock.expect(bundleContext.createFilter((String) capture(c))).andAnswer(new IAnswer() {
public Object answer() throws Throwable {
- return new FilterImpl((String) c.getValue());
+ return FilterImpl.newInstance((String) c.getValue());
}
}).anyTimes();
EasyMock.replay(new Object[] { bundleContext, systemBundle });
Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/ResolverImplTest.java Thu Feb 25 08:33:12 2010
@@ -135,7 +135,7 @@
final Capture c = new Capture();
EasyMock.expect(bundleContext.createFilter((String) capture(c))).andAnswer(new IAnswer() {
public Object answer() throws Throwable {
- return new FilterImpl((String) c.getValue());
+ return FilterImpl.newInstance((String) c.getValue());
}
}).anyTimes();
EasyMock.replay(new Object[] { bundleContext, systemBundle });
Modified: felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/StaxParserTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/StaxParserTest.java?rev=916181&r1=916180&r2=916181&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/StaxParserTest.java (original)
+++ felix/trunk/bundlerepository/src/test/java/org/apache/felix/bundlerepository/StaxParserTest.java Thu Feb 25 08:33:12 2010
@@ -137,7 +137,7 @@
final Capture c = new Capture();
EasyMock.expect(bundleContext.createFilter((String) capture(c))).andAnswer(new IAnswer() {
public Object answer() throws Throwable {
- return new FilterImpl((String) c.getValue());
+ return FilterImpl.newInstance((String) c.getValue());
}
}).anyTimes();
EasyMock.replay(new Object[] { bundleContext, systemBundle });