jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [18/50] [abbrv] jena git commit: modifications to rename jena security as jena permissions modifications to adapt to removed deprecated classes in org.apache.jena.
Date Sun, 26 Apr 2015 09:42:05 GMT
http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/java/org/apache/jena/security/model/SecuredStatementTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/security/model/SecuredStatementTest.java
b/jena-permissions/src/test/java/org/apache/jena/security/model/SecuredStatementTest.java
deleted file mode 100644
index 4345aa7..0000000
--- a/jena-permissions/src/test/java/org/apache/jena/security/model/SecuredStatementTest.java
+++ /dev/null
@@ -1,707 +0,0 @@
-/*
- * 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.
- */
-package org.apache.jena.security.model;
-
-import java.util.Set;
-
-import org.apache.jena.rdf.model.* ;
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.Factory;
-import org.apache.jena.security.MockSecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluatorParameters;
-import org.apache.jena.security.SecurityEvaluator.Action;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.security.model.SecuredStatement;
-import org.apache.jena.security.model.impl.SecuredStatementImpl;
-import org.apache.jena.shared.PropertyNotFoundException ;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith( value = SecurityEvaluatorParameters.class )
-public class SecuredStatementTest
-{
-	private final MockSecurityEvaluator securityEvaluator;
-	private Statement baseStatement;
-	private SecuredStatement securedStatement;
-	private Model baseModel;
-	private SecuredModel securedModel;
-	private Property property;
-
-	public SecuredStatementTest( final MockSecurityEvaluator securityEvaluator )
-	{
-		this.securityEvaluator = securityEvaluator;
-	}
-
-	protected Model createModel()
-	{
-		return ModelFactory.createDefaultModel();
-	}
-
-	@Before
-	public void setup()
-	{
-		baseModel = createModel();
-		property = ResourceFactory
-				.createProperty("http://example.com/property");
-		baseModel.add(ResourceFactory.createResource(), property,
-				ResourceFactory.createResource());
-		baseStatement = baseModel.listStatements().next();
-		securedModel = Factory.getInstance(securityEvaluator,
-				"http://example.com/securedModel", baseModel);
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement);
-	}
-
-	/**
-	 * @sec.graph Update
-	 * @sec.triple Update
-	 * @throws AccessDeniedException
-	 */
-	@Test
-	public void testChangeLiteralObject()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util
-				.asSet(new Action[] { Action.Update });
-		try
-		{
-			securedStatement.changeLiteralObject(true);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeLiteralObject('c');
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeLiteralObject(3.14d);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeLiteralObject(3.14F);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeLiteralObject(2);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeLiteralObject(2L);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeObject(ResourceFactory.createResource());
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeObject("Waaa hooo");
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			final Literal l = ResourceFactory
-					.createTypedLiteral(Integer.MAX_VALUE);
-			securedStatement.changeObject(l.getLexicalForm(), true);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeObject("dos", "es");
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.changeObject("dos", "es", false);
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-	}
-
-	@Test
-	public void testCreateReifiedStatement()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util.asSet(new Action[] {
-				Action.Update, Action.Create });
-
-		try
-		{
-			securedStatement.createReifiedStatement();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		try
-		{
-			securedStatement.createReifiedStatement("http://example.com/rsURI");
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testGetProperty()
-	{
-		// get property of the object
-		baseModel.add(baseStatement.getObject().asResource(), property,
-				ResourceFactory.createResource());
-		try
-		{
-			securedStatement.getProperty(property);
-			if (!securityEvaluator.evaluate(Action.Read))
-			{
-				Assert.fail("Should have thrown PropertyNotFound Exception");
-			}
-		}
-		catch (final PropertyNotFoundException e)
-		{
-			if (securityEvaluator.evaluate(Action.Read))
-			{
-				Assert.fail(String
-						.format("Should not have thrown PropertyNotFound Exception: %s - %s",
-								e, securityEvaluator));
-			}
-		}
-	}
-
-	@Test
-	public void testGets()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util
-				.asSet(new Action[] { Action.Read });
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(true));
-		try
-		{
-			securedStatement.getBoolean();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(Byte.MAX_VALUE));
-		try
-		{
-			securedStatement.getByte();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject('c'));
-		try
-		{
-			securedStatement.getChar();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(3.14d));
-		try
-		{
-			securedStatement.getDouble();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(3.14F));
-		try
-		{
-			securedStatement.getFloat();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(2));
-		try
-		{
-			securedStatement.getInt();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeObject("dos", "es"));
-		try
-		{
-			securedStatement.getLanguage();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(2L));
-		try
-		{
-			securedStatement.getLong();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(Short.MAX_VALUE));
-		try
-		{
-			securedStatement.getShort();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeObject("who hoo"));
-		try
-		{
-			securedStatement.getString();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeObject("who hoo"));
-		try
-		{
-			securedStatement.hasWellFormedXML();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testGetStatementProperty()
-	{
-		// get property of the subject
-		final ReifiedStatement s = baseStatement.createReifiedStatement();
-		s.addLiteral(property, "yee haw");
-		securedStatement.getStatementProperty(property);
-
-	}
-
-	@Test
-	public void testIsReified()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util
-				.asSet(new Action[] { Action.Read });
-
-		try
-		{
-			securedStatement.isReified();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testListReifiedStatements()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util
-				.asSet(new Action[] { Action.Read });
-
-		try
-		{
-			securedStatement.listReifiedStatements();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testRemove()
-	{
-		final Set<Action> perms = SecurityEvaluator.Util.asSet(new Action[] {
-				Action.Update, Action.Delete });
-
-		try
-		{
-			securedStatement.remove();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testRemoveReification()
-	{
-		baseStatement.createReifiedStatement();
-		final Set<Action> perms = SecurityEvaluator.Util.asSet(new Action[] {
-				Action.Update, Action.Delete });
-
-		try
-		{
-			securedStatement.removeReification();
-			if (!securityEvaluator.evaluate(perms))
-			{
-				Assert.fail("Should have thrown AccessDenied Exception");
-			}
-		}
-		catch (final AccessDeniedException e)
-		{
-			if (securityEvaluator.evaluate(perms))
-			{
-				Assert.fail(String
-						.format("Should not have thrown AccessDenied Exception: %s - %s",
-								e, e.getTriple()));
-			}
-		}
-	}
-
-	@Test
-	public void testUnsecuredGets()
-	{
-		securedStatement.getAlt();
-		securedStatement.getBag();
-		securedStatement.getSeq();
-
-		securedStatement.getResource();
-		// securedStatement.getResource( ResourceF f );
-		securedStatement.getSubject();
-
-		securedStatement = SecuredStatementImpl.getInstance(securedModel,
-				baseStatement.changeLiteralObject(true));
-		securedStatement.getLiteral();
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/java/org/apache/jena/security/query/DataSetTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/security/query/DataSetTest.java
b/jena-permissions/src/test/java/org/apache/jena/security/query/DataSetTest.java
deleted file mode 100644
index 47bcfbd..0000000
--- a/jena-permissions/src/test/java/org/apache/jena/security/query/DataSetTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * 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.
- */
-package org.apache.jena.security.query;
-
-import org.apache.jena.query.* ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.security.Factory;
-import org.apache.jena.security.MockSecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator.SecNode.Type;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.tdb.TDB ;
-import org.apache.jena.tdb.TDBFactory ;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class DataSetTest {
-	private Dataset dataset;
-	private Model baseModel;
-	private MockSecurityEvaluator eval;
-	private SecuredModel dftModel;
-	
-	@BeforeClass
-	public static void setupFactory()
-	{
-		SecuredQueryEngineFactory.register();
-	}
-
-	@AfterClass
-	public static void teardownFactory()
-	{
-		SecuredQueryEngineFactory.unregister();
-	}
-	
-	
-	public void setup() {
-		
-		 DatasetGraph dsg = TDBFactory.createDatasetGraph() ;
-
-	       
-	    dsg.getContext().set(TDB.symUnionDefaultGraph, true) ;
-	    Dataset myDataset = DatasetFactory.create(dsg) ; 
-		
-//		DatasetGraph dsg = DatasetGraphFactory.createMem() ;
-//		
-//		Dataset myDataset = TDBFactory.createDataset();
-	    baseModel = myDataset.getNamedModel( "http://example.com/baseModel");
-		//baseModel = myDataset.getDefaultModel();
-		baseModel = QueryEngineTest.populateModel( baseModel );
-		
-		dftModel = Factory.getInstance(eval,
-				"http://example.com/securedModel", baseModel);
-		
-	    dataset = DatasetFactory.createMem() ;
-	    dataset.setDefaultModel(dftModel) ;
-
-//	   // dataset.addNamedModel( dftModel.getModelIRI(), dftModel);
-	    
-	  
-        
-	}
-	
-	@Test
-	public void testOpenQueryType()
-	{
-		eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true);
-		
-		setup();
-		
-		try
-		{
-			final String query = "prefix fn: <http://www.w3.org/2005/xpath-functions#>  "
-					+ " SELECT ?foo ?bar WHERE "
-					+ " { ?foo a <http://example.com/class> ; "
-					+ "?bar [] ."
-					+ "  } ";
-			final QueryExecution qexec = QueryExecutionFactory.create(query,
-					dataset);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					final QuerySolution soln = results.nextSolution();
-				}
-				Assert.assertEquals(8, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-		}
-		finally
-		{
-			dataset.close();
-		}
-	}
-
-	@Test
-	public void testRestrictedQueryType()
-	{
-		eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true) {
-
-			@Override
-			public boolean evaluate( final Object principal, final Action action,
-					final SecNode graphIRI, final SecTriple triple )
-			{
-				if (triple.getSubject().equals(
-						new SecNode(Type.URI, "http://example.com/resource/1")))
-				{
-					return false;
-				}
-				return super.evaluate(principal, action, graphIRI, triple);
-			}
-		};
-		
-		setup();
-		
-		try
-		{
-			final String query = "prefix fn: <http://www.w3.org/2005/xpath-functions#>  "
-					+ " SELECT ?foo ?bar WHERE "
-					+ " { ?foo a <http://example.com/class> ; "
-					+ "?bar [] ."
-					+ "  } ";
-			final QueryExecution qexec = QueryExecutionFactory.create(query,
-					dataset);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					results.nextSolution();
-				}
-				Assert.assertEquals(4, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-		}
-		finally
-		{
-			dataset.close();
-		}
-	}
-	
-	@Test
-	public void testSelectAllType()
-	{
-		eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true) {
-
-			@Override
-			public boolean evaluate( final Object principal, final Action action,
-					final SecNode graphIRI, final SecTriple triple )
-			{
-				if (triple.getSubject().equals(
-						new SecNode(Type.URI, "http://example.com/resource/1")))
-				{
-					return false;
-				}
-				return super.evaluate(principal, action, graphIRI, triple);
-			}
-		};
-		
-		setup();
-		
-		try
-		{
-			 String query = "SELECT ?s ?p ?o WHERE "
-					+ " { ?s ?p ?o } ";
-			 QueryExecution qexec = QueryExecutionFactory.create(query,
-					dataset);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					final QuerySolution soln = results.nextSolution();
-					//System.out.println( soln );
-				}
-				// 2x 3 values + type triple
-				Assert.assertEquals(8, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-			
-			query = "SELECT ?g ?s ?p ?o WHERE "
-					+ " { GRAPH ?g {?s ?p ?o } }";
-			qexec = QueryExecutionFactory.create(query,
-					dataset);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					final QuerySolution soln = results.nextSolution();
-					//System.out.println( soln );
-				}
-				// 2x 3 values + type triple
-				// all are in the base graph so no named graphs
-				Assert.assertEquals(0, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-		}
-		finally
-		{
-			dataset.close();
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/java/org/apache/jena/security/query/QueryEngineTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/security/query/QueryEngineTest.java
b/jena-permissions/src/test/java/org/apache/jena/security/query/QueryEngineTest.java
deleted file mode 100644
index 7bee511..0000000
--- a/jena-permissions/src/test/java/org/apache/jena/security/query/QueryEngineTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * 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.
- */
-package org.apache.jena.security.query;
-
-import org.apache.jena.query.QueryExecution ;
-import org.apache.jena.query.QueryExecutionFactory ;
-import org.apache.jena.query.QuerySolution ;
-import org.apache.jena.query.ResultSet ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.ModelFactory ;
-import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.rdf.model.ResourceFactory ;
-import org.apache.jena.security.Factory;
-import org.apache.jena.security.MockSecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator.SecNode.Type;
-import org.apache.jena.security.model.SecuredModel;
-import org.apache.jena.vocabulary.RDF ;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class QueryEngineTest {
-
-	@BeforeClass
-	public static void setupFactory() {
-		SecuredQueryEngineFactory.register();
-	}
-
-	@AfterClass
-	public static void teardownFactory() {
-		SecuredQueryEngineFactory.unregister();
-	}
-
-	Model baseModel;
-
-	public QueryEngineTest() {
-
-	}
-
-
-	public static Model populateModel(Model baseModel)
-	{
-
-		Resource r = ResourceFactory
-				.createResource("http://example.com/resource/1");
-		final Resource o = ResourceFactory
-				.createResource("http://example.com/class");
-		baseModel.add(r, RDF.type, o);
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_1"),
-				ResourceFactory.createTypedLiteral(1));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_2"),
-				ResourceFactory.createTypedLiteral("foo"));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_3"),
-				ResourceFactory.createTypedLiteral(3.14));
-		r = ResourceFactory.createResource("http://example.com/resource/2");
-		baseModel.add(r, RDF.type, o);
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_1"),
-				ResourceFactory.createTypedLiteral(2));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_2"),
-				ResourceFactory.createTypedLiteral("bar"));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_3"),
-				ResourceFactory.createTypedLiteral(6.28));
-
-		r = ResourceFactory.createResource("http://example.com/resource/3");
-		baseModel.add(r, RDF.type, ResourceFactory
-				.createResource("http://example.com/anotherClass"));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_1"),
-				ResourceFactory.createTypedLiteral(3));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_2"),
-				ResourceFactory.createTypedLiteral("baz"));
-		baseModel.add(r, ResourceFactory
-				.createProperty("http://example.com/property/_3"),
-				ResourceFactory.createTypedLiteral(9.42));
-		return baseModel;
-	}
-	
-	@Before
-	public void setUp()
-	{
-		baseModel = populateModel( ModelFactory.createDefaultModel());
-	}
-
-	@After
-	public void tearDown() {
-		baseModel.close();
-	}
-
-	@Test
-	public void testOpenQueryType() {
-		final SecurityEvaluator eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true);
-		final SecuredModel model = Factory.getInstance(eval,
-				"http://example.com/securedModel", baseModel);
-		try {
-			final String query = "prefix fn: <http://www.w3.org/2005/xpath-functions#>  "
-					+ " SELECT ?foo ?bar WHERE "
-					+ " { ?foo a <http://example.com/class> ; "
-					+ "?bar [] ."
-					+ "  } ";
-			final QueryExecution qexec = QueryExecutionFactory.create(query,
-					model);
-			try {
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();) {
-					count++;
-					final QuerySolution soln = results.nextSolution();
-				}
-				Assert.assertEquals(8, count);
-			} finally {
-				qexec.close();
-			}
-		} finally {
-			model.close();
-		}
-	}
-
-	@Test
-	public void testRestrictedQueryType() {
-		final SecurityEvaluator eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true) {
-
-			@Override
-			public boolean evaluate(final Object principal,
-					final Action action, final SecNode graphIRI,
-					final SecTriple triple) {
-				if (triple.getSubject().equals(
-						new SecNode(Type.URI, "http://example.com/resource/1"))) {
-					return false;
-				}
-				return super.evaluate(principal, action, graphIRI, triple);
-			}
-		};
-		final SecuredModel model = Factory.getInstance(eval,
-				"http://example.com/securedModel", baseModel);
-		try {
-			final String query = "prefix fn: <http://www.w3.org/2005/xpath-functions#>  "
-					+ " SELECT ?foo ?bar WHERE "
-					+ " { ?foo a <http://example.com/class> ; "
-					+ "?bar [] ."
-					+ "  } ";
-			final QueryExecution qexec = QueryExecutionFactory.create(query,
-					model);
-			try {
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();) {
-					count++;
-					results.nextSolution();
-				}
-				Assert.assertEquals(4, count);
-			} finally {
-				qexec.close();
-			}
-		} finally {
-			model.close();
-		}
-	}
-
-	@Test
-	public void testSelectAllType()
-	{
-		final SecurityEvaluator eval = new MockSecurityEvaluator(true, true,
-				true, true, true, true) {
-
-			@Override
-			public boolean evaluate(Object principal, final Action action,
-					final SecNode graphIRI, final SecTriple triple )
-			{
-				if (triple.getSubject().equals(
-						new SecNode(Type.URI, "http://example.com/resource/1")))
-				{
-					return false;
-				}
-				return super.evaluate(principal, action, graphIRI, triple);
-			}
-		};
-		final SecuredModel model = Factory.getInstance(eval,
-				"http://example.com/securedModel", baseModel);
-		try
-		{
-			 String query = "SELECT ?s ?p ?o WHERE "
-					+ " { ?s ?p ?o } ";
-			 QueryExecution qexec = QueryExecutionFactory.create(query,
-					model);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					final QuerySolution soln = results.nextSolution();
-					//System.out.println( soln );
-				}
-				// 2x 3 values + type triple
-				Assert.assertEquals(8, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-			
-			query = "SELECT ?s ?p ?o WHERE "
-					+ " { GRAPH ?g {?s ?p ?o } }";
-			qexec = QueryExecutionFactory.create(query,
-					model);
-			try
-			{
-				final ResultSet results = qexec.execSelect();
-				int count = 0;
-				for (; results.hasNext();)
-				{
-					count++;
-					final QuerySolution soln = results.nextSolution();
-					//System.out.println( soln );
-				}
-				// 2x 3 values + type triple
-				// no named graphs so no results.
-				Assert.assertEquals(0, count);
-			}
-			finally
-			{
-				qexec.close();
-			}
-		}
-		finally
-		{
-			model.close();
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/java/org/apache/jena/security/query/rewriter/OpRewriterTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/security/query/rewriter/OpRewriterTest.java
b/jena-permissions/src/test/java/org/apache/jena/security/query/rewriter/OpRewriterTest.java
deleted file mode 100644
index eaec4b7..0000000
--- a/jena-permissions/src/test/java/org/apache/jena/security/query/rewriter/OpRewriterTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.
- */
-package org.apache.jena.security.query.rewriter;
-
-import java.util.Arrays;
-
-import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.security.AccessDeniedException;
-import org.apache.jena.security.MockSecurityEvaluator;
-import org.apache.jena.security.SecurityEvaluator;
-import org.apache.jena.security.query.rewriter.OpRewriter;
-import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.algebra.op.OpBGP ;
-import org.apache.jena.sparql.algebra.op.OpFilter ;
-import org.apache.jena.sparql.core.BasicPattern ;
-import org.apache.jena.sparql.expr.ExprList ;
-import org.apache.jena.vocabulary.RDF ;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OpRewriterTest
-{
-	private OpRewriter rewriter;
-	private Triple[] triples;
-	
-	public OpRewriterTest()
-	{
-	}
-	
-	@Before
-	public void setup()
-	{
-		triples = new Triple[] {
-				new Triple( NodeFactory.createVariable("foo"), RDF.type.asNode(), NodeFactory.createURI(
"http://example.com/class")),
-				new Triple( NodeFactory.createVariable("foo"), NodeFactory.createAnon(), NodeFactory.createVariable("bar")),
-				new Triple( NodeFactory.createVariable("bar"), NodeFactory.createAnon(), NodeFactory.createVariable("baz")),
-		};
-	}
-	
-	@Test
-	public void testBGP()
-	{
-		SecurityEvaluator securityEvaluator =  new MockSecurityEvaluator( true, true, true, true,
true, true );
-		rewriter = new OpRewriter( securityEvaluator, "http://example.com/dummy");
-		
-		rewriter.visit( new OpBGP( BasicPattern.wrap(Arrays.asList(triples))));
-		Op op = rewriter.getResult();
-		Assert.assertTrue( "Should have been an OpFilter", op instanceof OpFilter );
-		OpFilter filter = (OpFilter) op;
-		ExprList eLst = filter.getExprs();
-		Assert.assertEquals( 1, eLst.size());
-		Assert.assertTrue( "Should have been a SecuredFunction", eLst.get(0) instanceof SecuredFunction);
-		op = filter.getSubOp();
-		Assert.assertTrue( "Should have been a OpBGP", op instanceof OpBGP);
-		BasicPattern basicPattern = ((OpBGP)op).getPattern();
-		Assert.assertEquals( 3, basicPattern.size() );
-		
-		Triple t = basicPattern.get(0);
-		Assert.assertEquals(  NodeFactory.createVariable("foo"), t.getSubject());
-		Assert.assertEquals( RDF.type.asNode(), t.getPredicate());
-		Assert.assertEquals( NodeFactory.createURI( "http://example.com/class"), t.getObject());
-		
-		t = basicPattern.get(1);
-		Assert.assertEquals(  NodeFactory.createVariable("foo"), t.getSubject());
-		Assert.assertTrue( "Should have been blank", t.getPredicate().isBlank());
-		Assert.assertEquals( NodeFactory.createVariable("bar"), t.getObject());	
-		
-		t = basicPattern.get(2);
-		Assert.assertEquals( NodeFactory.createVariable("bar"), t.getSubject() );
-		Assert.assertTrue( "Should have been blank", t.getPredicate().isBlank());
-		Assert.assertEquals( NodeFactory.createVariable("baz"), t.getObject());	
-	}
-	
-	@Test
-	public void testBGPNoReadAccess()
-	{
-		SecurityEvaluator securityEvaluator =  new MockSecurityEvaluator( true, true, false, true,
true, true );
-		rewriter = new OpRewriter( securityEvaluator, "http://example.com/dummy");
-		Triple[] triples = {
-				new Triple( NodeFactory.createVariable("foo"), RDF.type.asNode(), NodeFactory.createURI(
"http://example.com/class")),
-				new Triple( NodeFactory.createVariable("foo"), NodeFactory.createAnon(), NodeFactory.createVariable("bar")),
-				new Triple( NodeFactory.createVariable("bar"), NodeFactory.createAnon(), NodeFactory.createVariable("baz")),
-		};
-		try {
-			rewriter.visit( new OpBGP( BasicPattern.wrap(Arrays.asList(triples))));
-			Assert.fail( "Should have thrown AccessDeniedException");
-		}
-		catch (AccessDeniedException e)
-		{
-			// expected
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/permissions/SecuredAssemblerTest.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/permissions/SecuredAssemblerTest.ttl
b/jena-permissions/src/test/resources/org/apache/jena/permissions/SecuredAssemblerTest.ttl
new file mode 100644
index 0000000..b1313e6
--- /dev/null
+++ b/jena-permissions/src/test/resources/org/apache/jena/permissions/SecuredAssemblerTest.ttl
@@ -0,0 +1,56 @@
+@prefix rdf:        <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:       <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl:        <http://www.w3.org/2002/07/owl#> .
+
+@prefix ja:         <http://jena.hpl.hp.com/2005/11/Assembler#> .
+@prefix sec:		<http://apache.org/jena/permissions/Assembler#> .
+@prefix my:         <http://apache.org/jena/permissions/test#> .
+@prefix xsd:        <http://www.w3.org/2001/XMLSchema#>
+
+<>	ja:loadClass	"org.apache.jena.permissions.SecuredAssembler" .
+
+sec:Model 
+	rdfs:subClassOf ja:NamedModel ;
+	 .
+
+my:baseModel 
+	a ja:MemoryModel;
+	.
+	
+my:secModel
+	a sec:Model;
+	sec:baseModel my:baseModel ;
+	ja:modelName "http://example.com/securedModel" ;
+	sec:evaluatorFactory "org.apache.jena.permissions.MockSecurityEvaluator" ;
+	.
+		
+my:secModel2
+    a sec:Model;
+    sec:baseModel my:baseModel ;
+    ja:modelName "http://example.com/securedModel2" ;
+    sec:evaluatorImpl my:secEvaluator ;
+    .
+        
+my:secEvaluator
+    a sec:Evaluator ;
+    sec:args [  rdf:_1 "bob" ;
+                ] ;
+    sec:evaluatorClass "org.apache.jena.permissions.StaticSecurityEvaluator" ;
+    .
+    
+my:secModel3
+    a sec:Model;
+    sec:baseModel my:baseModel ;
+    ja:modelName "http://example.com/securedModel3" ;
+    sec:evaluatorImpl my:secEvaluator2 ;
+    .
+    
+ my:secEvaluator2
+    a sec:Evaluator ;
+    sec:args [  rdf:_1 my:baseModel ;
+                ] ;
+    sec:evaluatorClass "org.apache.jena.permissions.ModelBasedSecurityEvaluator" ;
+    .
+        
+    
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/permissions/model/detail.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/permissions/model/detail.ttl
b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/detail.ttl
new file mode 100644
index 0000000..643c586
--- /dev/null
+++ b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/detail.ttl
@@ -0,0 +1,33 @@
+@prefix ex: <http://example.com/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+ex:msg1 rdf:type ex:msg; 
+	ex:to "bob";
+	ex:from "alice" ;
+	ex:subj "alice to bob 1";
+	.
+
+ex:msg2  rdf:type ex:msg; 
+	ex:to "alice";
+	ex:from "bob";
+	ex:subj "bob to alice 1";
+	.
+	
+ex:msg3  rdf:type ex:msg; 
+	ex:to "chuck" ;
+	ex:from "alice";
+	ex:subj "alice to chuck 1";
+	.
+	
+ex:msg4  rdf:type ex:msg; 
+	ex:to "darla" ;
+	ex:from "bob" ;
+	ex:subj "bob to darla 1"
+	.
+
+ex:msg5  rdf:type ex:msg; 
+	ex:to "alice";
+	ex:from "bob";
+	ex:subj "bob to alice 2";
+	.
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.ttl
b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.ttl
new file mode 100644
index 0000000..2fbb4e3
--- /dev/null
+++ b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.ttl
@@ -0,0 +1,2 @@
+@prefix rt: <http://example.com/readTest#> .
+rt:1 a rt:3 .
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.xml
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.xml
b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.xml
new file mode 100644
index 0000000..18ad45a
--- /dev/null
+++ b/jena-permissions/src/test/resources/org/apache/jena/permissions/model/test.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rt="http://example.com/readTest#" xmlns:j.0="http://example.com/readTest#3">
+	<rdf:Description rdf:about="http://example.com/readTest#1">
+		<rdf:type rdf:resource="http://example.com/readTest#3" />
+	</rdf:Description>
+</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
b/jena-permissions/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
deleted file mode 100644
index b8289f7..0000000
--- a/jena-permissions/src/test/resources/org/apache/jena/security/SecuredAssemblerTest.ttl
+++ /dev/null
@@ -1,56 +0,0 @@
-@prefix rdf:        <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:       <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl:        <http://www.w3.org/2002/07/owl#> .
-
-@prefix ja:         <http://jena.hpl.hp.com/2005/11/Assembler#> .
-@prefix sec:		<http://apache.org/jena/security/Assembler#> .
-@prefix my:         <http://apache.org/jena/security/test#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#>
-
-<>	ja:loadClass	"org.apache.jena.security.SecuredAssembler" .
-
-sec:Model 
-	rdfs:subClassOf ja:NamedModel ;
-	 .
-
-my:baseModel 
-	a ja:MemoryModel;
-	.
-	
-my:secModel
-	a sec:Model;
-	sec:baseModel my:baseModel ;
-	ja:modelName "http://example.com/securedModel" ;
-	sec:evaluatorFactory "org.apache.jena.security.MockSecurityEvaluator" ;
-	.
-		
-my:secModel2
-    a sec:Model;
-    sec:baseModel my:baseModel ;
-    ja:modelName "http://example.com/securedModel2" ;
-    sec:evaluatorImpl my:secEvaluator ;
-    .
-        
-my:secEvaluator
-    a sec:Evaluator ;
-    sec:args [  rdf:_1 "bob" ;
-                ] ;
-    sec:evaluatorClass "org.apache.jena.security.StaticSecurityEvaluator" ;
-    .
-    
-my:secModel3
-    a sec:Model;
-    sec:baseModel my:baseModel ;
-    ja:modelName "http://example.com/securedModel3" ;
-    sec:evaluatorImpl my:secEvaluator2 ;
-    .
-    
- my:secEvaluator2
-    a sec:Evaluator ;
-    sec:args [  rdf:_1 my:baseModel ;
-                ] ;
-    sec:evaluatorClass "org.apache.jena.security.ModelBasedSecurityEvaluator" ;
-    .
-        
-    
-    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/security/model/detail.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/security/model/detail.ttl
b/jena-permissions/src/test/resources/org/apache/jena/security/model/detail.ttl
deleted file mode 100644
index 643c586..0000000
--- a/jena-permissions/src/test/resources/org/apache/jena/security/model/detail.ttl
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix ex: <http://example.com/> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-ex:msg1 rdf:type ex:msg; 
-	ex:to "bob";
-	ex:from "alice" ;
-	ex:subj "alice to bob 1";
-	.
-
-ex:msg2  rdf:type ex:msg; 
-	ex:to "alice";
-	ex:from "bob";
-	ex:subj "bob to alice 1";
-	.
-	
-ex:msg3  rdf:type ex:msg; 
-	ex:to "chuck" ;
-	ex:from "alice";
-	ex:subj "alice to chuck 1";
-	.
-	
-ex:msg4  rdf:type ex:msg; 
-	ex:to "darla" ;
-	ex:from "bob" ;
-	ex:subj "bob to darla 1"
-	.
-
-ex:msg5  rdf:type ex:msg; 
-	ex:to "alice";
-	ex:from "bob";
-	ex:subj "bob to alice 2";
-	.
-	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/security/model/test.ttl
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/security/model/test.ttl b/jena-permissions/src/test/resources/org/apache/jena/security/model/test.ttl
deleted file mode 100644
index 2fbb4e3..0000000
--- a/jena-permissions/src/test/resources/org/apache/jena/security/model/test.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix rt: <http://example.com/readTest#> .
-rt:1 a rt:3 .
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/c4b0113d/jena-permissions/src/test/resources/org/apache/jena/security/model/test.xml
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/resources/org/apache/jena/security/model/test.xml b/jena-permissions/src/test/resources/org/apache/jena/security/model/test.xml
deleted file mode 100644
index 18ad45a..0000000
--- a/jena-permissions/src/test/resources/org/apache/jena/security/model/test.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns:rt="http://example.com/readTest#" xmlns:j.0="http://example.com/readTest#3">
-	<rdf:Description rdf:about="http://example.com/readTest#1">
-		<rdf:type rdf:resource="http://example.com/readTest#3" />
-	</rdf:Description>
-</rdf:RDF>


Mime
View raw message