Changeset 5456


Ignore:
Timestamp:
Mar 17, 2020, 1:50:16 PM (12 months ago)
Author:
Christian Schulte
Message:

o Merged changes up to 5455 from 'trunk' into branch 'jomc-ri-1.x'.

Closes #143

Location:
jomc-ri/branches/jomc-ri-1.x
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • jomc-ri/branches/jomc-ri-1.x

  • jomc-ri/branches/jomc-ri-1.x/pom.xml

    r5414 r5456  
    3535    <groupId>org.jomc</groupId>
    3636    <artifactId>jomc-pom</artifactId>
    37     <version>1.6</version>
     37    <version>1.7.0-SNAPSHOT</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
     
    6666          <groupId>org.jomc</groupId>
    6767          <artifactId>maven-jomc-plugin</artifactId>
    68           <version>1.10.1</version>
     68          <version>1.11.0-SNAPSHOT</version>
    6969          <executions>
    7070            <execution>
     
    156156      <groupId>org.jomc</groupId>
    157157      <artifactId>jomc-util</artifactId>
    158       <version>1.10</version>
     158      <version>1.11.0-SNAPSHOT</version>
    159159      <scope>compile</scope>
    160160    </dependency>
     
    162162      <groupId>org.jomc</groupId>
    163163      <artifactId>jomc-modlet</artifactId>
    164       <version>1.10.1</version>
     164      <version>1.11.0-SNAPSHOT</version>
    165165      <scope>compile</scope>
    166166    </dependency>
     
    168168      <groupId>org.jomc</groupId>
    169169      <artifactId>jomc-model</artifactId>
    170       <version>1.10.1</version>
     170      <version>1.11.0-SNAPSHOT</version>
    171171      <scope>compile</scope>
    172172    </dependency>
     
    174174      <groupId>org.jomc</groupId>
    175175      <artifactId>jomc-api</artifactId>
    176       <version>1.10</version>
     176      <version>1.11.0-SNAPSHOT</version>
    177177      <scope>compile</scope>
    178178    </dependency>
     
    180180      <groupId>org.jomc</groupId>
    181181      <artifactId>jomc-spi</artifactId>
    182       <version>1.10</version>
     182      <version>1.11.0-SNAPSHOT</version>
    183183      <scope>compile</scope>
    184184    </dependency>
     
    197197    </site>
    198198  </distributionManagement>
     199  <properties>
     200    <jomc.module.name>org.jomc.ri</jomc.module.name>
     201  </properties>
    199202  <profiles>
    200203    <profile>
     
    213216      </dependencies>
    214217    </profile>
     218    <profile>
     219      <id>jdk11</id>
     220      <activation>
     221        <jdk>11</jdk>
     222      </activation>
     223      <dependencies>
     224        <dependency>
     225          <groupId>jakarta.annotation</groupId>
     226          <artifactId>jakarta.annotation-api</artifactId>
     227          <version>1.3.5</version>
     228          <scope>compile</scope>
     229          <optional>true</optional>
     230        </dependency>
     231        <dependency>
     232          <groupId>jakarta.activation</groupId>
     233          <artifactId>jakarta.activation-api</artifactId>
     234          <version>1.2.2</version>
     235          <scope>compile</scope>
     236        </dependency>
     237        <dependency>
     238          <groupId>jakarta.xml.bind</groupId>
     239          <artifactId>jakarta.xml.bind-api</artifactId>
     240          <version>2.3.3</version>
     241          <scope>compile</scope>
     242        </dependency>
     243        <dependency>
     244          <groupId>org.glassfish.jaxb</groupId>
     245          <artifactId>jaxb-runtime</artifactId>
     246          <version>2.3.2</version>
     247          <scope>runtime</scope>
     248        </dependency>
     249        <dependency>
     250          <!-- Needed for javax.rmi.PortableRemoteObject only. -->
     251          <groupId>org.glassfish.corba</groupId>
     252          <artifactId>glassfish-corba-omgapi</artifactId>
     253          <version>4.2.1</version>
     254          <scope>provided</scope>
     255        </dependency>
     256      </dependencies>
     257    </profile>
    215258  </profiles>
    216259</project>
  • jomc-ri/branches/jomc-ri-1.x/src/main/java/org/jomc/ri/DefaultLocator.java

    r5414 r5456  
    186186            if ( !this.isLocationSupported( location ) )
    187187            {
    188                 throw new IOException( getUnsupportedUriSchemeMessage( Locale.getDefault(), location.getScheme() ) );
     188                throw new IOException( getUnsupportedUriMessage( Locale.getDefault(), location.toASCIIString() ) );
    189189            }
    190190
     
    314314    }
    315315    /**
    316      * Gets the text of the {@code <Unsupported URI Scheme Message>} message.
     316     * Gets the text of the {@code <Unsupported URI Message>} message.
    317317     * <p><dl>
    318318     *   <dt><b>Languages:</b></dt>
     
    322322     * </dl></p>
    323323     * @param locale The locale of the message to return.
    324      * @param schemeInfo Format argument.
    325      * @return The text of the {@code <Unsupported URI Scheme Message>} message for {@code locale}.
     324     * @param uriInfo Format argument.
     325     * @return The text of the {@code <Unsupported URI Message>} message for {@code locale}.
    326326     * @throws org.jomc.ObjectManagementException if getting the message instance fails.
    327327     */
    328328    @SuppressWarnings({"unchecked", "unused", "PMD.UnnecessaryFullyQualifiedName"})
    329329    @javax.annotation.Generated( value = "org.jomc.tools.SourceFileProcessor 1.10.1", comments = "See http://www.jomc.org/jomc-tools/1.10.1" )
    330     private static String getUnsupportedUriSchemeMessage( final java.util.Locale locale, final java.lang.String schemeInfo )
     330    private static String getUnsupportedUriMessage( final java.util.Locale locale, final java.lang.String uriInfo )
    331331    {
    332332        java.io.BufferedReader reader = null;
     
    334334        try
    335335        {
    336             final String message = java.text.MessageFormat.format( java.util.ResourceBundle.getBundle( "org.jomc.ri.DefaultLocator", locale ).getString( "Unsupported URI Scheme Message" ), schemeInfo, (Object) null );
     336            final String message = java.text.MessageFormat.format( java.util.ResourceBundle.getBundle( "org.jomc.ri.DefaultLocator", locale ).getString( "Unsupported URI Message" ), uriInfo, (Object) null );
    337337            final java.lang.StringBuilder builder = new java.lang.StringBuilder( message.length() );
    338338            reader = new java.io.BufferedReader( new java.io.StringReader( message ) );
  • jomc-ri/branches/jomc-ri-1.x/src/main/resources/META-INF/jomc.xml

    r5370 r5456  
    463463      </authors>
    464464      <messages>
    465         <message name="Unsupported URI Scheme Message">
    466           <template defaultLanguage="en">
    467             <text language="en">URI scheme ''{0}'' is not supported.</text>
    468             <text language="de">Keine Unterstützung für URI Schema ''{0}''.</text>
    469           </template>
    470           <arguments>
    471             <argument index="0" name="Scheme Info"/>
     465        <message name="Unsupported URI Message">
     466          <template defaultLanguage="en">
     467            <text language="en">URI ''{0}'' is not supported.</text>
     468            <text language="de">Keine Unterstützung für URI ''{0}''.</text>
     469          </template>
     470          <arguments>
     471            <argument index="0" name="URI Info"/>
    472472          </arguments>
    473473        </message>
Note: See TracChangeset for help on using the changeset viewer.