http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
----------------------------------------------------------------------
diff --git 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
index ec2a6c0..e7b66fa 100644
--- 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
+++ 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
@@ -80,10 +80,10 @@ public interface IdentityManager
             if( isIdentity( canonicalName ) )
             {
                 // This is already an ID, and we simply return it.
-                return StringIdentity.identity( canonicalName );
+                return StringIdentity.identityOf( canonicalName );
             }
             String prefix = findPrefix( type );
-            return StringIdentity.identity( prefix + SEPARATOR + canonicalName 
);
+            return StringIdentity.identityOf( prefix + SEPARATOR + 
canonicalName );
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
----------------------------------------------------------------------
diff --git 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
index 2204980..b497ebd 100644
--- 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
+++ 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
@@ -80,18 +80,18 @@ public interface EntryPointResource extends 
ServerResource<EntryPoint>
                         RestLink link;
                         if( route.getDescription() == null )
                         {
-                            link = resourceBuilder.createRestLink( 
StringIdentity.identity( template.getPattern() ), hostRef, Method.GET );
+                            link = resourceBuilder.createRestLink( 
StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET );
                         }
                         else
                         {
-                            link = resourceBuilder.createRestLink( 
StringIdentity.identity( template.getPattern() ), hostRef, Method.GET, 
route.getDescription() );
+                            link = resourceBuilder.createRestLink( 
StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET, 
route.getDescription() );
                         }
                         entryPoints.put( route.getName(), link );
                     }
                 }
             }
             ValueBuilder<EntryPoint> builder = vbf.newValueBuilder( 
EntryPoint.class );
-            builder.prototype().identity().set( StringIdentity.identity( "/" ) 
);
+            builder.prototype().identity().set( StringIdentity.identityOf( "/" 
) );
             builder.prototype().api().set( entryPoints );
             return builder.newInstance();
         }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
----------------------------------------------------------------------
diff --git 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
index b59aac8..be851a6 100644
--- 
a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
+++ 
b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
@@ -143,7 +143,7 @@ public interface ResourceBuilder
         public RestForm createNameForm( Reference base )
         {
             ValueBuilder<RestForm> builder = vbf.newValueBuilder( 
RestForm.class );
-            builder.prototype().link().set( createRestLink( 
StringIdentity.identity( "form" ), base, Method.POST ) );
+            builder.prototype().link().set( createRestLink( 
StringIdentity.identityOf( "form" ), base, Method.POST ) );
             builder.prototype().fields().set( Collections.singletonList( 
createFormField( "name", FormField.TEXT ) ) );
             return builder.newInstance();
         }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
----------------------------------------------------------------------
diff --git 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
index e3d8e73..1618cc0 100644
--- 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
+++ 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
@@ -70,7 +70,7 @@ public class DataSourceAssembler
     {
         module.importedServices( DataSource.class ).
             importedBy( ServiceInstanceImporter.class ).
-            setMetaInfo( StringIdentity.identity( dataSourceServiceId ) ).
+            setMetaInfo( StringIdentity.identityOf( dataSourceServiceId ) ).
             identifiedBy( identity() ).
             visibleIn( visibility() );
         if( circuitBreaker != null )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
----------------------------------------------------------------------
diff --git 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
index 78cf765..2e833bb 100644
--- 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
+++ 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
@@ -65,7 +65,7 @@ public class ExternalDataSourceAssembler
     {
         if( circuitBreaker != null )
         {
-            externalDataSource = DataSources.wrapWithCircuitBreaker( 
StringIdentity.identity( identity() ), externalDataSource, circuitBreaker );
+            externalDataSource = DataSources.wrapWithCircuitBreaker( 
StringIdentity.identityOf( identity() ), externalDataSource, circuitBreaker );
         }
         module.importedServices( DataSource.class ).
             identifiedBy( identity() ).

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/libraries/sql/src/main/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerService.java
----------------------------------------------------------------------
diff --git 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerService.java
 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerService.java
index ec49c23..fb279e1 100644
--- 
a/libraries/sql/src/main/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerService.java
+++ 
b/libraries/sql/src/main/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerService.java
@@ -175,7 +175,7 @@ public interface DataSourceConfigurationManagerService
             EditableConfiguration( MBeanInfo info, String identity, 
Map<String, AccessibleObject> propertyNames )
             {
                 this.info = info;
-                this.identity = StringIdentity.identity( identity );
+                this.identity = StringIdentity.identityOf( identity );
                 this.propertyNames = propertyNames;
             }
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext.java
----------------------------------------------------------------------
diff --git 
a/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext.java
 
b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext.java
index 9bd5878..1ae3c2b 100644
--- 
a/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext.java
+++ 
b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext.java
@@ -133,8 +133,8 @@ public class PayBillsContext
             {
                 // Creditor retrieval could be a use case in itself...
                 List<BalanceData> creditors = new ArrayList<BalanceData>();
-                creditors.add( uowf.currentUnitOfWork().get( 
CreditorRolemap.class, StringIdentity.identity( "BakerAccount" ) ) );
-                creditors.add( uowf.currentUnitOfWork().get( 
CreditorRolemap.class, StringIdentity.identity( "ButcherAccount" ) ) );
+                creditors.add( uowf.currentUnitOfWork().get( 
CreditorRolemap.class, StringIdentity.identityOf( "BakerAccount" ) ) );
+                creditors.add( uowf.currentUnitOfWork().get( 
CreditorRolemap.class, StringIdentity.identityOf( "ButcherAccount" ) ) );
                 return creditors;
             }
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext2.java
----------------------------------------------------------------------
diff --git 
a/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext2.java
 
b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext2.java
index ba5a40d..3606713 100644
--- 
a/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext2.java
+++ 
b/samples/dci/src/main/java/org/apache/polygene/dci/moneytransfer/context/PayBillsContext2.java
@@ -126,8 +126,8 @@ public class PayBillsContext2
         {
             // Creditor retrieval could be a use case in itself...
             List<BalanceData> creditors = new ArrayList<>();
-            creditors.add( uowf.currentUnitOfWork().get( BalanceData.class, 
StringIdentity.identity( "BakerAccount" ) ) );
-            creditors.add( uowf.currentUnitOfWork().get( BalanceData.class, 
StringIdentity.identity( "ButcherAccount" ) ) );
+            creditors.add( uowf.currentUnitOfWork().get( BalanceData.class, 
StringIdentity.identityOf( "BakerAccount" ) ) );
+            creditors.add( uowf.currentUnitOfWork().get( BalanceData.class, 
StringIdentity.identityOf( "ButcherAccount" ) ) );
             return creditors;
         }
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/AccountIds.java
----------------------------------------------------------------------
diff --git 
a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/AccountIds.java
 
b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/AccountIds.java
index 4456660..323335b 100644
--- 
a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/AccountIds.java
+++ 
b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/AccountIds.java
@@ -24,9 +24,9 @@ import org.apache.polygene.api.identity.StringIdentity;
 
 public interface AccountIds
 {
-    Identity SAVINGS_ACCOUNT_ID = StringIdentity.identity( "SavingsAccountId" 
);
-    Identity CHECKING_ACCOUNT_ID = StringIdentity.identity( 
"CheckingAccountId" );
-    Identity CREDITOR_ID1 = StringIdentity.identity( "BakerAccount" );
-    Identity CREDITOR_ID2 = StringIdentity.identity( "ButcherAccount" );
+    Identity SAVINGS_ACCOUNT_ID = StringIdentity.identityOf( 
"SavingsAccountId" );
+    Identity CHECKING_ACCOUNT_ID = StringIdentity.identityOf( 
"CheckingAccountId" );
+    Identity CREDITOR_ID1 = StringIdentity.identityOf( "BakerAccount" );
+    Identity CREDITOR_ID2 = StringIdentity.identityOf( "ButcherAccount" );
 
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Forums.java
----------------------------------------------------------------------
diff --git 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Forums.java
 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Forums.java
index cc70100..3dea65a 100644
--- 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Forums.java
+++ 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Forums.java
@@ -38,7 +38,7 @@ import static 
org.apache.polygene.api.query.QueryExpressions.templateFor;
 public interface Forums
     extends Administrators, EntityComposite
 {
-    Identity FORUMS_ID = StringIdentity.identity( "forums" );
+    Identity FORUMS_ID = StringIdentity.identityOf( "forums" );
 
     Query<Forum> forums();
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Users.java
----------------------------------------------------------------------
diff --git 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Users.java
 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Users.java
index aa16c40..41b9434 100644
--- 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Users.java
+++ 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/data/entity/Users.java
@@ -41,7 +41,7 @@ import static 
org.apache.polygene.api.query.QueryExpressions.templateFor;
 public interface Users
     extends EntityComposite, Events
 {
-    Identity USERS_ID = StringIdentity.identity( "users" );
+    Identity USERS_ID = StringIdentity.identityOf( "users" );
 
     Query<User> users();
 

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/BoardResource.java
----------------------------------------------------------------------
diff --git 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/BoardResource.java
 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/BoardResource.java
index f748192..eac4823 100644
--- 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/BoardResource.java
+++ 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/BoardResource.java
@@ -37,7 +37,7 @@ public class BoardResource
     public void resource( String segment )
         throws ResourceException
     {
-        selectFromManyAssociation( ObjectSelection.current().get( Forum.class 
).boards(),  StringIdentity.identity( segment ) );
+        selectFromManyAssociation( ObjectSelection.current().get( Forum.class 
).boards(),  StringIdentity.identityOf( segment ) );
         subResource( BoardResource.class );
     }
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumResource.java
----------------------------------------------------------------------
diff --git 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumResource.java
 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumResource.java
index abf7c18..3e1fac4 100644
--- 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumResource.java
+++ 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumResource.java
@@ -37,7 +37,7 @@ public class ForumResource
     public void resource( String segment )
         throws ResourceException
     {
-        selectFromManyAssociation( ObjectSelection.current().get( Forum.class 
).boards(), StringIdentity.identity( segment ) );
+        selectFromManyAssociation( ObjectSelection.current().get( Forum.class 
).boards(), StringIdentity.identityOf( segment ) );
         subResource( BoardResource.class );
     }
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumsResource.java
----------------------------------------------------------------------
diff --git 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumsResource.java
 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumsResource.java
index 5c14ec2..1c1c60c 100644
--- 
a/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumsResource.java
+++ 
b/samples/forum/src/main/java/org/apache/polygene/sample/forum/rest/resource/forum/ForumsResource.java
@@ -36,7 +36,7 @@ public class ForumsResource
     public void resource( String segment )
         throws ResourceException
     {
-        select( Forum.class, StringIdentity.identity( segment ) );
+        select( Forum.class, StringIdentity.identityOf( segment ) );
         subResource( ForumResource.class );
     }
 }

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/rental/src/main/java/org/apache/polygene/sample/rental/domain/dev/InitialData.java
----------------------------------------------------------------------
diff --git 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/domain/dev/InitialData.java
 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/domain/dev/InitialData.java
index 0ac3450..db70f40 100644
--- 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/domain/dev/InitialData.java
+++ 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/domain/dev/InitialData.java
@@ -198,7 +198,7 @@ public interface InitialData
         private RentalShop createShop( UnitOfWork uow )
             throws UnitOfWorkCompletionException
         {
-            return uow.newEntity( RentalShop.class, StringIdentity.identity( 
"SHOP" ) );
+            return uow.newEntity( RentalShop.class, StringIdentity.identityOf( 
"SHOP" ) );
         }
 
         private void createCustomers( RentalShop shop )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/BookingPage.java
----------------------------------------------------------------------
diff --git 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/BookingPage.java
 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/BookingPage.java
index 4c39f73..2aa0c98 100644
--- 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/BookingPage.java
+++ 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/BookingPage.java
@@ -52,7 +52,7 @@ public interface BookingPage
             Element result = dom.createElementNS( Page.XHTML, "div" );
             String bookingId = context.path();
             UnitOfWork uow = uowf.currentUnitOfWork();
-            Booking booking = uow.get( Booking.class, StringIdentity.identity( 
bookingId ) );
+            Booking booking = uow.get( Booking.class, 
StringIdentity.identityOf( bookingId ) );
             Car car = booking.car().get();
             createChildNode( dom, result, car.model().get() );
             createChildNode( dom, result, car.licensePlate().get() );
@@ -73,7 +73,7 @@ public interface BookingPage
             Element result = dom.createElementNS( Page.XHTML, "div" );
             String bookingId = context.path();
             UnitOfWork uow = uowf.currentUnitOfWork();
-            Booking booking = uow.get( Booking.class, StringIdentity.identity( 
bookingId ) );
+            Booking booking = uow.get( Booking.class, 
StringIdentity.identityOf( bookingId ) );
             Customer customer = booking.customer().get();
             createChildNode( dom, result, customer.name().get() );
             createChildNode( dom, result, 
customer.address().get().line1().get() );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/MainPage.java
----------------------------------------------------------------------
diff --git 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/MainPage.java
 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/MainPage.java
index 328c41b..884f702 100644
--- 
a/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/MainPage.java
+++ 
b/samples/rental/src/main/java/org/apache/polygene/sample/rental/web/MainPage.java
@@ -59,7 +59,7 @@ public interface MainPage
             ArrayList<Node> nodes = new ArrayList<Node>();
             Document dom = context.dom();
             UnitOfWork uow = uowf.currentUnitOfWork();
-            RentalShop shop = uow.get( RentalShop.class, 
StringIdentity.identity( "SHOP" ) );
+            RentalShop shop = uow.get( RentalShop.class, 
StringIdentity.identityOf( "SHOP" ) );
             for( Booking booking : shop.findAllBookings() )
             {
                 String plate = booking.car().get().licensePlate().get();

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
----------------------------------------------------------------------
diff --git 
a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
 
b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
index 61de7ed..43be59d 100644
--- 
a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
+++ 
b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java
@@ -243,7 +243,7 @@ public abstract class AbstractEntityStorePerformanceTest
                 UnitOfWork uow = uowf.newUnitOfWork( newUsecase( 
"readEntityWithComplexType PREPARE " + bulk ) );
                 for( int i = 0; i < ITERATIONS; i++ )
                 {
-                    ComplexProduct product = uow.newEntity( 
ComplexProduct.class, StringIdentity.identity( "product" + i ) );
+                    ComplexProduct product = uow.newEntity( 
ComplexProduct.class, StringIdentity.identityOf( "product" + i ) );
                     product.name().set( "Product " + i );
 
                     if( i % 1000 == 0 )
@@ -265,7 +265,7 @@ public abstract class AbstractEntityStorePerformanceTest
                 String id = rnd.nextInt( ITERATIONS ) + "";
                 for( int i = 0; i < ITERATIONS; i++ )
                 {
-                    ComplexProduct product = uow.get( ComplexProduct.class, 
StringIdentity.identity( "product" + id ) );
+                    ComplexProduct product = uow.get( ComplexProduct.class, 
StringIdentity.identityOf( "product" + id ) );
                     product.name().get();
                     if( i % 100 == 0 )
                     {

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/domain/person/initialdata/SamplePersonInitialData.java
----------------------------------------------------------------------
diff --git 
a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/domain/person/initialdata/SamplePersonInitialData.java
 
b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/domain/person/initialdata/SamplePersonInitialData.java
index 626415e..10fa526 100644
--- 
a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/domain/person/initialdata/SamplePersonInitialData.java
+++ 
b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/domain/person/initialdata/SamplePersonInitialData.java
@@ -94,7 +94,7 @@ public interface SamplePersonInitialData
 
         private void createPerson( UnitOfWork uow, String personId, String 
firstName, String lastName )
         {
-            EntityBuilder<Person> person = uow.newEntityBuilder( Person.class, 
StringIdentity.identity( personId ) );
+            EntityBuilder<Person> person = uow.newEntityBuilder( Person.class, 
StringIdentity.identityOf( personId ) );
 
             PersonEntity.PersonState state = person.instanceFor( 
PersonEntity.PersonState.class );
             state.firstName().set( firstName );

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0d9e8a1b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
----------------------------------------------------------------------
diff --git 
a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
 
b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
index dd103d8..908030f 100644
--- 
a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
+++ 
b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat;
 public class HelloTest4 extends AbstractPolygeneTest
 {
 
-    public static final Identity TEST_IDENTITY = StringIdentity.identity( 
"123" );
+    public static final Identity TEST_IDENTITY = StringIdentity.identityOf( 
"123" );
 
     @Override
     public void assemble( ModuleAssembly module )

Reply via email to