Project

General

Profile

« Previous | Next » 

Revision d220174c

Added by Cherian Mathew almost 9 years ago

changed references of cdmlib-remote-webapp to cdm-webapp

View differences:

pom.xml
121 121
    <repository>
122 122
      <id>EditLocalRepository</id>
123 123
      <!-- disable the local repo to let maven always retrieve the latest 
124
        cdmlib-remote-webapp.war TODO: use ${localrepo} for ${user.home}/.m2/repository 
124
        cdm-webapp.war TODO: use ${localrepo} for ${user.home}/.m2/repository 
125 125
        in MAVEN 3 -->
126 126
      <url>file://${user.home}/.m2/repository/eu/etaxonomy/</url>
127 127
      <releases>
......
339 339
              <overWriteReleases>true</overWriteReleases>
340 340
              <artifactItems>
341 341
                <artifactItem>
342
                  <!-- copy the cdmlib-remote-webapp-${project.version}.war 
342
                  <!-- copy the cdm-webapp-${project.version}.war 
343 343
                    to the build dir -->
344 344
                  <groupId>eu.etaxonomy</groupId>
345
                  <artifactId>cdmlib-remote-webapp</artifactId>
345
                  <artifactId>cdm-webapp</artifactId>
346 346
                  <version>${project.version}</version>
347 347
                  <type>war</type>
348 348
                  <!-- <classifier> [classifier - optional] </classifier> -->
349 349
                  <overWrite>true</overWrite>
350
                  <destFileName>cdmlib-remote-webapp-${project.version}.war</destFileName>
350
                  <destFileName>cdm-webapp-${project.version}.war</destFileName>
351 351
                  <outputDirectory>
352 352
                    ${project.build.directory}
353 353
                  </outputDirectory>
......
359 359
      </plugin>
360 360

  
361 361
      <!-- ====== PACKAGE ====== -->
362
      <!-- package the default webapp, // (and also add the cdmlib-remote-webapp.war) 
362
      <!-- package the default webapp, // (and also add the cdm-webapp.war) 
363 363
        test with: mvn war:war -->
364 364
      <plugin>
365 365
        <groupId>org.apache.maven.plugins</groupId>
......
368 368
        <configuration>
369 369
          <warName>default-webapp</warName>
370 370
          <packagingExcludes>
371
            cdmlib-remote-webapp-*.war
371
            cdm-webapp-*.war
372 372
          </packagingExcludes>
373
          <!-- <overlays> <overlay> <groupId>eu.etaxonomy</groupId> <artifactId>cdmlib-remote-webapp</artifactId> 
373
          <!-- <overlays> <overlay> <groupId>eu.etaxonomy</groupId> <artifactId>cdm-webapp</artifactId> 
374 374
            <!- - version is set in dependency - -> <skip>true</skip> <!- - Do Not overlay 
375 375
            - -> </overlay> </overlays> -->
376 376
        </configuration>
......
603 603

  
604 604
  <dependencies>
605 605
    <!-- maven 3 no longer supports uniqueVersions for SNAPSHOT artifacts. 
606
      The cdm-server Bootlader however relies on a specific name of the cdmlib-remote-webapp 
606
      The cdm-server Bootlader however relies on a specific name of the cdm-webapp 
607 607
      war file. In order to achieve this with maven 3 the below dependency is now 
608 608
      handled more explicitely by utilizing the dependency:copy-dependencies gloal 
609 609
      in the build/plugins section <dependency> <groupId>eu.etaxonomy</groupId> 
610
      <artifactId>cdmlib-remote-webapp</artifactId> <version>${project.version}</version> 
610
      <artifactId>cdm-webapp</artifactId> <version>${project.version}</version> 
611 611
      <type>war</type> </dependency> -->
612 612
    <!-- JETTY 7 -->
613 613
    <dependency>
src/jenkins-ci/update-stable-folder.sh
28 28
##############################################################
29 29

  
30 30
cd $WORKSPACE
31
PROJECT_VERSION=(`cat target/classes/version.properties | grep "cdmlib-remote-webapp.version" | sed -e "s/[^0-9]*\([^\n\r]*\)/\1/g"`)
31
PROJECT_VERSION=(`cat target/classes/version.properties | grep "cdm-webapp.version" | sed -e "s/[^0-9]*\([^\n\r]*\)/\1/g"`)
32 32

  
33 33
if [ -n "$PROJECT_VERSION" ]; then
34 34
 ssh $SSH_HOST "rm -r /var/www/download/cdmserver/stable"
src/main/assembly/assembly.xml
43 43
		<dependencySet>
44 44
			<outputDirectory />
45 45
			<includes>
46
				<include>eu.etaxonomy:cdmlib-remote-webapp</include>
46
				<include>eu.etaxonomy:cdm-webapp</include>
47 47
			</includes>
48 48
		</dependencySet>
49 49
	</dependencySets>
src/main/java/eu/etaxonomy/cdm/server/Bootloader.java
104 104
    private static final String APPLICATION_NAME = "CDM Server";
105 105
    private static final String WAR_POSTFIX = ".war";
106 106

  
107
    private static final String CDMLIB_REMOTE_WEBAPP = "cdmlib-remote-webapp";
108
    private static final String CDMLIB_REMOTE_WEBAPP_VERSION = "cdmlib-remote-webapp.version";
107
    private static final String CDM_WEBAPP = "cdm-webapp";
108
    private static final String CDM_WEBAPP_VERSION = "cdm-webapp.version";
109 109

  
110 110
    private static final String DEFAULT_WEBAPP_WAR_NAME = "default-webapp";
111 111
    private static final File DEFAULT_WEBAPP_TEMP_FOLDER = new File(TMP_PATH + DEFAULT_WEBAPP_WAR_NAME);
112
    private static final File CDM_WEBAPP_TEMP_FOLDER = new File(TMP_PATH + CDMLIB_REMOTE_WEBAPP);
112
    private static final File CDM_WEBAPP_TEMP_FOLDER = new File(TMP_PATH + CDM_WEBAPP);
113 113

  
114 114
    private final InstanceManager instanceManager = new InstanceManager(new File(USERHOME_CDM_LIBRARY_PATH, DATASOURCE_BEANDEF_FILE));
115 115

  
......
320 320
        } else {
321 321
            // read version number
322 322
            String version = readCdmRemoteVersion();
323
            cdmRemoteWebAppFile = extractWar(CDMLIB_REMOTE_WEBAPP + "-" + version);
323
            cdmRemoteWebAppFile = extractWar(CDM_WEBAPP + "-" + version);
324 324
            defaultWebAppFile = extractWar(DEFAULT_WEBAPP_WAR_NAME);
325 325
        }
326 326

  
......
473 473
        if (versionInStream != null){
474 474
            Properties versionProperties = new Properties();
475 475
            versionProperties.load(versionInStream);
476
            version = versionProperties.getProperty(CDMLIB_REMOTE_WEBAPP_VERSION, version);
476
            version = versionProperties.getProperty(CDM_WEBAPP_VERSION, version);
477 477
        }
478 478
        return version;
479 479
    }
......
605 605
             */
606 606
            WebAppClassLoader classLoader = new WebAppClassLoader(cdmWebappContext);
607 607
            if(webAppClassPath != null){
608
                logger.info("Running cdmlib-remote-webapp from source folder: Adding class path supplied by option '-" +  WEBAPP_CLASSPATH.getOpt() +" =" + webAppClassPath +"'  to WebAppClassLoader");
608
                logger.info("Running cdm-webapp from source folder: Adding class path supplied by option '-" +  WEBAPP_CLASSPATH.getOpt() +" =" + webAppClassPath +"'  to WebAppClassLoader");
609 609
                classLoader.addClassPath(webAppClassPath);
610 610
            } else {
611
                throw new RuntimeException("Classpath cdmlib-remote-webapp for missing while running cdmlib-remote-webapp from source folder. Please supplied cdm-server option '-" +  WEBAPP_CLASSPATH.getOpt() +"");
611
                throw new RuntimeException("Classpath cdm-webapp for missing while running cdm-webapp from source folder. Please supplied cdm-server option '-" +  WEBAPP_CLASSPATH.getOpt() +"");
612 612
            }
613 613
            cdmWebappContext.setClassLoader(classLoader);
614 614
        }
......
685 685
    private void updateServerRunMode() {
686 686
        String webappPathNormalized = cdmRemoteWebAppFile.getAbsolutePath().replace('\\', '/');
687 687
        isRunningFromSource =  webappPathNormalized.endsWith("src/main/webapp");
688
        isRunningfromTargetFolder = webappPathNormalized.endsWith("cdmlib-remote-webapp/target/cdmserver");
688
        isRunningfromTargetFolder = webappPathNormalized.endsWith("cdm-webapp/target/cdmserver");
689 689
        isRunningFromWarFile = !(isRunningFromSource || isRunningfromTargetFolder);
690 690
    }
691 691

  
......
714 714
    }
715 715

  
716 716
    /**
717
     * @return a File object pointing to the location of the cdmlib-remote-webapp
717
     * @return a File object pointing to the location of the cdm-webapp
718 718
     */
719 719
    public File getCdmRemoteWebAppFile(){
720 720
        if(cdmRemoteWebAppFile == null){
src/main/java/eu/etaxonomy/cdm/server/CommandOptions.java
38 38
                    "  In development mode the default webapplication containing the cdm-server management web \n" +
39 39
                    "  interface will be loaded from the source folder cdm-server/src/main/webapp. In normal \n" +
40 40
                    "  mode the default-webapp.war file will be used insead.\n" +
41
                    "  Using the following paths developers can run the cdmlib-remote-webapp instaces completely\n" +
41
                    "  Using the following paths developers can run the cdm-webapp instances completely\n" +
42 42
                    "  from the target folder or from source (examples are for the eclipse ide):\n" +
43
                    "   - run from maven target: '{cdmlib-project-root}/cdmlib-remote-webapp/target/cdmserver'\n " +
44
                    "   - run from source: '{cdmlib-project-root}/cdmlib-remote-webapp/src/main/webapp'\n" +
43
                    "   - run from maven target: '{cdmlib-project-root}/cdm-webapp/target/cdmserver'\n " +
44
                    "   - run from source: '{cdmlib-project-root}/cdm-webapp/src/main/webapp'\n" +
45 45
                    "     When running from source you must also set the webapp-classpath option: \n" +
46
                    "     -webappClasspath=${project_classpath:cdmlib-remote-webapp} " )
46
                    "     -webappClasspath=${project_classpath:cdm-webapp} " )
47 47
            .create("webapp");
48 48

  
49 49
  @SuppressWarnings("static-access")
50 50
    public static final Option WEBAPP_CLASSPATH = OptionBuilder
51 51
            .withArgName("classpath")
52 52
            .hasArg()
53
            .withDescription("Sets the classpath for the cdmlib-remote-webapp instance when running from source code,\n" +
54
                    "e.g: ${project_classpath:cdmlib-remote-webapp}\n" +
53
            .withDescription("Sets the classpath for the cdm-webapp instance when running from source code,\n" +
54
                    "e.g: ${project_classpath:cdm-webapp}\n" +
55 55
                    "See option -webapp")
56 56
            .create("webappClasspath");
57 57

  
src/main/java/eu/etaxonomy/cdm/server/instance/SharedAttributes.java
48 48
    public static final String ATTRIBUTE_ERROR_MESSAGES = "cdm.errorMessages";
49 49

  
50 50
    /**
51
     * Force a schema update when the cdmlib-remote-webapp instance is starting up
51
     * Force a schema update when the cdm-webapp instance is starting up
52 52
     * same as <code>eu.etaxonomy.cdm.remote.config.DataSourceConfigurer.ATTRIBUTE_FORCE_SCHEMA_UPDATE</code>
53 53
     */
54 54
    public static final String ATTRIBUTE_FORCE_SCHEMA_UPDATE = "cdm.forceSchemaUpdate";
src/main/resources/version.properties
1
cdmlib-remote-webapp.version=${project.version}
1
cdm-webapp.version=${project.version}

Also available in: Unified diff