Skip to content

Commit

Permalink
Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kern…
Browse files Browse the repository at this point in the history 
…el.version]
  • Loading branch information
@rasika
rasika committed Jan 7, 2017
1 parent e04be13 commit a6e5ab4
Show file tree
Hide file tree
Showing 26 changed files with 189 additions and 190 deletions.
40 changes: 20 additions & 20 deletions modules/core/distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<artifactItem>
<groupId>org.wso2.carbon</groupId>
<artifactId>wso2carbon-core</artifactId>
<version>${carbon.kernel.version.iotcore}</version>
<version>${carbon.kernel.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>target</outputDirectory>
Expand All @@ -105,7 +105,7 @@
<tasks>
<echo message="########### Create Device Management H2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
Expand All @@ -115,7 +115,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />

<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand All @@ -132,7 +132,7 @@
<tasks>
<echo message="########### Create Certificate Management H2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
Expand All @@ -141,7 +141,7 @@
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand All @@ -158,7 +158,7 @@
<tasks>
<echo message="########### Create API Management H2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
Expand All @@ -168,7 +168,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />

<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand All @@ -186,7 +186,7 @@
<tasks>
<echo message="########### Create App Management H2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
Expand All @@ -196,7 +196,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />

<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand All @@ -214,7 +214,7 @@
<tasks>
<echo message="########### Create JAGH2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />
Expand All @@ -225,7 +225,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />

<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage/h2/h2.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand All @@ -243,7 +243,7 @@
<tasks>
<echo message="########### Create Social Plugin H2 Schema ###########" />

<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />
Expand All @@ -253,7 +253,7 @@
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />

<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social/h2/resource.sql" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
Expand Down Expand Up @@ -281,7 +281,7 @@
<include name="${project.artifactId}-${project.version}.zip" />
</fileset>
</unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components" overwrite="true">
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
<fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components" />
</copy>
<!--testing -->
Expand Down Expand Up @@ -310,7 +310,7 @@
<phase>package</phase>
<configuration>
<tasks>
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps" />
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
</tasks>
</configuration>
<goals>
Expand All @@ -327,8 +327,8 @@
<delete dir="target/archive-tmp" />
<delete dir="target/dependency-maven-plugin-markers" />
<delete dir="target/maven-archiver" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete file="target/${project.artifactId}-${project.version}.jar" />
<delete dir="target/sources" />
<delete dir="target/site" />
Expand All @@ -347,7 +347,7 @@
<phase>prepare-package</phase>
<configuration>
<tasks>
<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/">
<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
<include name="entitlement.properties" />
</replace>
</tasks>
Expand Down Expand Up @@ -422,7 +422,7 @@
</goals>
<configuration>
<file>
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/api-manager.xml
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/api-manager.xml
</file>
<replacements>
<replacement>
Expand All @@ -441,7 +441,7 @@
</goals>
<configuration>
<file>
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
</file>
<replacements>
<replacement>
Expand Down
Loading

0 comments on commit a6e5ab4

Please sign in to comment.