niclas 2004/03/01 15:45:34
Modified: merlin/platform/tutorials/security/application/impl/conf
block.xml kernel.xml
merlin/platform/tutorials/security/location/api maven.xml
merlin/platform/tutorials/security/location/api/src/java/tutorial/location
LocationPermission.java
merlin/platform/tutorials/security/location/impl maven.xml
merlin/platform/tutorials/security/location/impl/conf
block.xml
merlin/platform/tutorials/security/publisher/api maven.xml
merlin/platform/tutorials/security/publisher/impl maven.xml
Removed:
merlin/platform/tutorials/security/location/impl/src/java/tutorial/location
LocationComponent.java LocationComponent.xprofile
Log:
Some more touches to the tutorial.
Revision Changes Path
1.2 +2 -2
avalon/merlin/platform/tutorials/security/application/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/application/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 1 Mar 2004 23:04:24 -0000 1.1
+++ block.xml 1 Mar 2004 23:45:33 -0000 1.2
@@ -17,11 +17,11 @@
<include name="publisher" id="merlin-tutorial:publisher-impl" version="1.0"/>
<component name="spain"
- class="tutorial.application.Application">
+ class="tutorial.application.Application" activation="startup">
</component>
<component name="france"
- class="tutorial.application.Application">
+ class="tutorial.application.Application" activation="startup">
</component>
</container>
1.2 +2 -2
avalon/merlin/platform/tutorials/security/application/impl/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/application/impl/conf/kernel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel.xml 1 Mar 2004 23:04:24 -0000 1.1
+++ kernel.xml 1 Mar 2004 23:45:33 -0000 1.2
@@ -18,7 +18,7 @@
<profile name="FranceGranted">
<permissions>
<permission class="tutorial.location.LocationPermission"
- name="Europe.France" />
+ name="Europe.France.*" />
</permissions>
</profile>
@@ -26,7 +26,7 @@
<profile name="SpainGranted">
<permissions>
<permission class="tutorial.location.LocationPermission"
- name="Europe.Spain" />
+ name="Europe.Spain.*" />
</permissions>
</profile>
1.2 +2 -2 avalon/merlin/platform/tutorials/security/location/api/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/location/api/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 23:04:24 -0000 1.1
+++ maven.xml 1 Mar 2004 23:45:33 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
-</project>
\ No newline at end of file
+</project>
1.2 +4 -3
avalon/merlin/platform/tutorials/security/location/api/src/java/tutorial/location/LocationPermission.java
Index: LocationPermission.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/location/api/src/java/tutorial/location/LocationPermission.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocationPermission.java 1 Mar 2004 23:08:59 -0000 1.1
+++ LocationPermission.java 1 Mar 2004 23:45:33 -0000 1.2
@@ -17,7 +17,7 @@
package tutorial.location;
-import java.util.PropertyPermission;
+import java.security.BasicPermission;
/**
* The LocationPermission checks if the caller has access to the
@@ -25,9 +25,10 @@
*
* Locations has a dot-notation, such as Europe.Spain.Madrid, and
* if the caller is requesting Europe.Spain.Madrid, it will need
- * to be granted access to Europe, Europe.Spain or Europe.Spain.Madrid.
+ * to be granted access to Europe.*, Europe.Spain.* or
+ * Europe.Spain.Madrid.
*/
-public class LocationPermission extends PropertyPermission
+public class LocationPermission extends BasicPermission
{
public LocationPermission( String location )
1.2 +2 -2
avalon/merlin/platform/tutorials/security/location/impl/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/location/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 23:08:59 -0000 1.1
+++ maven.xml 1 Mar 2004 23:45:33 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
-</project>
\ No newline at end of file
+</project>
1.2 +2 -2
avalon/merlin/platform/tutorials/security/location/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/location/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 1 Mar 2004 23:08:59 -0000 1.1
+++ block.xml 1 Mar 2004 23:45:34 -0000 1.2
@@ -19,9 +19,9 @@
</classloader>
<component name="info"
- class="tutorial.location.LocationComponent">
+ class="tutorial.location.impl.LocationComponent">
<configuration>
- <source>Paris</source>
+ <source>Europe.France.Paris</source>
</configuration>
</component>
1.2 +2 -2
avalon/merlin/platform/tutorials/security/publisher/api/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/publisher/api/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 23:04:25 -0000 1.1
+++ maven.xml 1 Mar 2004 23:45:34 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
-</project>
\ No newline at end of file
+</project>
1.2 +2 -2
avalon/merlin/platform/tutorials/security/publisher/impl/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/security/publisher/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 23:04:25 -0000 1.1
+++ maven.xml 1 Mar 2004 23:45:34 -0000 1.2
@@ -1,7 +1,7 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="demo">
<attainGoal name="jar:install"/>
</preGoal>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
