Thanks for fixing this guys. Sorry about the breakage. Alex
On 8/19/07, Chris Custine <[EMAIL PROTECTED]> wrote: > > Hi Guys, > The build server should have caught this (in fact it did), but the > notification emails are failing since I upgraded the software so I will find > out why that is happening when I am back home tonight. > > Chris > > On 8/19/07, Emmanuel Lecharny <[EMAIL PROTECTED]> wrote: > > > > The very same for me. A cool way to get your mind up when you wake up :) > > > > Fixed and committed. > > > > On 8/19/07, David Jencks <[EMAIL PROTECTED]> wrote: > > > I experienced the same problem and solution > > > > > > thanks > > > david jencks > > > > > > On Aug 18, 2007, at 5:20 PM, Stefan Seelmann wrote: > > > > > > > Hi Alex, > > > > > > > > I have problems building the trunk. You added an jdk 1.4 rule to the > > > > pom.xml of the core-plugin module, but the DirectorySchemaToolMojo > > > > class > > > > uses an jdk 1.5 enum (ProducerTypeEnum). When removing that rule it > > > > builds correctly. > > > > > > > > Regards, > > > > Stefan Seelmann > > > > > > > > > > > > [EMAIL PROTECTED] schrieb: > > > >> Author: akarasulu > > > >> Date: Fri Aug 17 20:50:49 2007 > > > >> New Revision: 567223 > > > >> > > > >> URL: http://svn.apache.org/viewvc?view=rev&rev=567223 > > > >> Log: > > > >> just making sure some of these maven plugins adhere to jdk 1.4 > > > >> rules so they do not cause maven/plexus issues > > > >> > > > >> Modified: > > > >> directory/apacheds/trunk/bootstrap-plugin/pom.xml > > > >> directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/ > > > >> apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java > > > >> directory/apacheds/trunk/core-plugin/pom.xml > > > >> directory/apacheds/trunk/core-plugin/src/main/java/org/apache/ > > > >> directory/server/core/tools/schema/DirectorySchemaToolMojo.java > > > >> > > > >> Modified: directory/apacheds/trunk/bootstrap-plugin/pom.xml > > > >> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ > > > >> bootstrap-plugin/pom.xml?view=diff&rev=567223&r1=567222&r2=567223 > > > >> > > ===================================================================== > > > >> ========= > > > >> --- directory/apacheds/trunk/bootstrap-plugin/pom.xml (original) > > > >> +++ directory/apacheds/trunk/bootstrap-plugin/pom.xml Fri Aug 17 > > > >> 20:50:49 2007 > > > >> @@ -63,6 +63,10 @@ > > > >> <plugin> > > > >> <groupId>org.apache.maven.plugins</groupId> > > > >> <artifactId>maven-compiler-plugin</artifactId> > > > >> + <configuration> > > > >> + <source>1.4</source> > > > >> + <target>1.4</target> > > > >> + </configuration> > > > >> </plugin> > > > >> </plugins> > > > >> </build> > > > >> > > > >> Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/ > > > >> org/apache/directory/server/core/bootstrap/plugin/ > > > >> BootstrapPlugin.java > > > >> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ > > > >> bootstrap-plugin/src/main/java/org/apache/directory/server/core/ > > > >> bootstrap/plugin/BootstrapPlugin.java? > > > >> view=diff&rev=567223&r1=567222&r2=567223 > > > >> > > ===================================================================== > > > >> ========= > > > >> --- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/ > > > >> apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java > > > >> (original) > > > >> +++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/ > > > >> apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java > > > >> Fri Aug 17 20:50:49 2007 > > > >> @@ -412,7 +412,7 @@ > > > >> { > > > >> AttributeType at = ( AttributeType ) ii.next(); > > > >> String schemaName = > > > >> attributeTypeRegistry.getSchemaName( at.getOid() ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + > > > >> getNameOrNumericoid( at ) ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=attributeTypes" ); > > > >> @@ -440,7 +440,7 @@ > > > >> { > > > >> ObjectClass oc = ( ObjectClass ) ii.next(); > > > >> String schemaName = objectClassRegistry.getSchemaName > > > >> ( oc.getOid() ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + > > > >> getNameOrNumericoid( oc ) ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=objectClasses" ); > > > >> @@ -468,7 +468,7 @@ > > > >> { > > > >> MatchingRule mr = ( MatchingRule ) ii.next(); > > > >> String schemaName = matchingRuleRegistry.getSchemaName > > > >> ( mr.getOid() ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + > > > >> getNameOrNumericoid( mr ) ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=matchingRules" ); > > > >> @@ -496,7 +496,7 @@ > > > >> { > > > >> String oid = ( String ) ii.next(); > > > >> String schemaName = comparatorRegistry.getSchemaName > > > >> ( oid ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + oid > > ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=comparators" ); > > > >> @@ -524,7 +524,7 @@ > > > >> { > > > >> String oid = ( String ) ii.next(); > > > >> String schemaName = normalizerRegistry.getSchemaName > > > >> ( oid ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + oid > > ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=normalizers" ); > > > >> @@ -553,7 +553,7 @@ > > > >> Syntax syntax = ( Syntax ) ii.next(); > > > >> getLog().info( "\t\t o [" + syntax.getSchema() + "] - > > > >> " + getNameOrNumericoid( syntax ) ); > > > >> LdapDN dn = checkCreateSchema( syntax.getSchema() ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( syntax.getSchema() ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( syntax.getSchema() ); > > > >> dn.add( SchemaConstants.OU_AT + "=syntaxes" ); > > > >> dn.normalize( registries.getAttributeTypeRegistry > > > >> ().getNormalizerMapping() ); > > > >> checkCreateContainer( dn ); > > > >> @@ -579,7 +579,7 @@ > > > >> { > > > >> SyntaxChecker syntaxChecker = ( SyntaxChecker ) > > > >> ii.next (); > > > >> String schemaName = > > > >> syntaxCheckerRegistry.getSchemaName( syntaxChecker.getSyntaxOid() > > ); > > > >> - Schema schema = registries.getLoadedSchemas().get > > > >> ( schemaName ); > > > >> + Schema schema = ( Schema ) registries.getLoadedSchemas > > > >> ().get( schemaName ); > > > >> getLog().info( "\t\t o [" + schemaName + "] - " + > > > >> syntaxChecker.getSyntaxOid() ); > > > >> LdapDN dn = checkCreateSchema( schemaName ); > > > >> dn.add( SchemaConstants.OU_AT + "=syntaxCheckers" ); > > > >> > > > >> Modified: directory/apacheds/trunk/core-plugin/pom.xml > > > >> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core- > > > >> plugin/pom.xml?view=diff&rev=567223&r1=567222&r2=567223 > > > >> > > ===================================================================== > > > >> ========= > > > >> --- directory/apacheds/trunk/core-plugin/pom.xml (original) > > > >> +++ directory/apacheds/trunk/core-plugin/pom.xml Fri Aug 17 > > > >> 20:50:49 2007 > > > >> @@ -59,6 +59,15 @@ > > > >> </execution> > > > >> </executions> > > > >> </plugin> > > > >> + > > > >> + <plugin> > > > >> + <groupId>org.apache.maven.plugins</groupId> > > > >> + <artifactId>maven-compiler-plugin</artifactId> > > > >> + <configuration> > > > >> + <source>1.4</source> > > > >> + <target>1.4</target> > > > >> + </configuration> > > > >> + </plugin> > > > >> > > > >> <plugin> > > > >> <artifactId>maven-surefire-plugin</artifactId> > > > >> > > > >> Modified: directory/apacheds/trunk/core-plugin/src/main/java/org/ > > > >> apache/directory/server/core/tools/schema/ > > > >> DirectorySchemaToolMojo.java > > > >> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core- > > > >> plugin/src/main/java/org/apache/directory/server/core/tools/schema/ > > > >> DirectorySchemaToolMojo.java > > ?view=diff&rev=567223&r1=567222&r2=567223 > > > >> > > ===================================================================== > > > >> ========= > > > >> --- directory/apacheds/trunk/core-plugin/src/main/java/org/apache/ > > > >> directory/server/core/tools/schema/DirectorySchemaToolMojo.java > > > >> (original) > > > >> +++ directory/apacheds/trunk/core-plugin/src/main/java/org/apache/ > > > >> directory/server/core/tools/schema/DirectorySchemaToolMojo.java > > > >> Fri Aug 17 20:50:49 2007 > > > >> @@ -144,7 +144,7 @@ > > > >> > > > >> protected void generateRest( BootstrapSchema schema ) throws > > > >> Exception > > > >> { > > > >> - List<ProducerTypeEnum> types = new > > > >> ArrayList<ProducerTypeEnum>(); > > > >> + List types = new ArrayList(); > > > >> types.addAll( ProducerTypeEnum.getList() ); > > > >> types.remove( ProducerTypeEnum.ATTRIBUTE_TYPE_PRODUCER ); > > > >> types.remove( ProducerTypeEnum.OBJECT_CLASS_PRODUCER ); > > > >> @@ -152,7 +152,7 @@ > > > >> ProducerTypeEnum type = null; > > > >> for ( int ii = 0; ii < types.size(); ii++ ) > > > >> { > > > >> - type = types.get( ii ); > > > >> + type = ( ProducerTypeEnum ) types.get( ii ); > > > >> > > > >> if ( exists( schema.getFullDefaultBaseClassName > > > >> ( type ), type ) ) > > > >> { > > > >> > > > >> > > > > > > > > > > > > > > > > -- > > Regards, > > Cordialement, > > Emmanuel Lécharny > > www.iktek.com > > > >
