Commit 680a5cf6 by Hakan Uygun

refs #6198 tekir 2.5 release'i için ufak tefek düzenlemeler

parent 3b694a16
......@@ -10,4 +10,5 @@
*/*.classpath*
**/*/nbproject/**
**/*/nbactions.xml
/Tekir-dist/target/
\ No newline at end of file
/Tekir-dist/target/
/Tekir-liqui/target/
\ No newline at end of file
......@@ -22,6 +22,24 @@
<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>maven-download-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<id>install.pdf</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>http://tekir.com.tr/sites/default/files/linux-kurulum-2.1.pdf</url>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<executions>
......
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>dist</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.txt</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/conf</outputDirectory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.txt</exclude>
</excludes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<includes>
<include>*:ear:*</include>
</includes>
<outputFileNameMapping>
<id>dist</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.txt</include>
<include>**/*.sh</include>
</includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/conf</outputDirectory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.txt</exclude>
<exclude>**/*.sh</exclude>
</excludes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
<filtered>false</filtered>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<includes>
<include>*:ear:*</include>
</includes>
<outputFileNameMapping>
${artifact.artifactId}.${artifact.extension}
</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
# Tekir ${project.version} Kurulum Betigi
cp tekir-ear.ear $1/server/default/deploy
cp conf/tekir-ds.xml $1/server/default/deploy
cp conf/tekir-mail-service.xml $1/server/default/deploy
cp conf/tekir.properties $1/server/default/conf
cp conf/mysql-connector-java-5.1.6-bin.jar $1/server/default/lib
echo $1/server/default/deploy/tekir-ds.xml içerisinde veri tabanı yolunu düzeltiniz
echo $1/server/default/deploy/tekir-mail-service.xml içerisinde e-posta sunucu bilgilerini düzeltiniz
echo veri tabanı kurulumunu yapınız
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
Tekir 2.5 Release Notes
\ No newline at end of file
Tekir ${project.version} Kurulumu
1. Ear Kopyalanması :
{JBOSS}/server/default/deploy altına tekir-ear.ear dosyası kopyalanır
2. Ayar dosyaları
......@@ -16,7 +16,7 @@
-->
<jndi-name>tekirDatasource</jndi-name>
<connection-url>jdbc:mysql://localhost:3306/genom?characterEncoding=UTF-8</connection-url>
<connection-url>jdbc:mysql://localhost:3306/tekir?characterEncoding=UTF-8</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<user-name>root</user-name>
<password>root</password>
......
# Tekir 2.1 Configurations
# Tekir 2.X Configurations
# uygulama basliginda kullanilacak logo png 64x64pix
branding.logo.file=/var/tekir/sablonlar/logo.png
# uygulama basligi
branding.title=Tekir Otomasyon 2.1
branding.title=Tekir Otomasyon ${project.version}
# rapor sablonlarinda kullanilacak logo gif 128x64pix
report.logo.file=/var/tekir/sablonlar/logo2.gif
......
......@@ -102,82 +102,105 @@
Maven filter properties are ony visible to
resources and can not be accessed from the POM.
<filters>
<filter>../src/main/filters/filter-${env}.properties</filter>
</filters>
-->
<filters>
<filter>../src/main/filters/filter-${env}.properties</filter>
</filters>
-->
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering> <!-- filtering persistence.xml -->
</resource>
</resources>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering> <!-- filtering persistence.xml -->
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
<testResource>
<directory>src/test/resources-openejb</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
<testResource>
<directory>src/test/resources-openejb</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<!--
Maven filter properties are ony visible to resources and can not be
accessed from the POM. This is where the Properties Maven Plugin makes
our life a little easier when dealing with properties that we need to
access inside our POM. It provides goals to read and write properties
from and to files, and also to set system properties. It's main use-case
is loading properties from files instead of declaring them in pom.xml,
something that comes in handy when dealing with different environments.
The plugin is configured to read properties during the "validate" phase
and the properties are then accessible from the pom.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<executions>
<execution>
<configuration>
<files>
<file>${basedir}/../src/main/filters/filter-${env}.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugins>
<!--
Maven filter properties are ony visible to resources and can not be
accessed from the POM. This is where the Properties Maven Plugin makes
our life a little easier when dealing with properties that we need to
access inside our POM. It provides goals to read and write properties
from and to files, and also to set system properties. It's main use-case
is loading properties from files instead of declaring them in pom.xml,
something that comes in handy when dealing with different environments.
The plugin is configured to read properties during the "validate" phase
and the properties are then accessible from the pom.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<executions>
<execution>
<configuration>
<files>
<file>${basedir}/../src/main/filters/filter-${env}.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>
testng.xml
</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Build-Date>${timestamp}</Build-Date>
<Build-Revision>${buildNumber}</Build-Revision>
<Mode>${env}</Mode>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>
testng.xml
</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Build-Date>${timestamp}</Build-Date>
<Build-Revision>${buildNumber}</Build-Revision>
<Mode>${env}</Mode>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<inherited>true</inherited>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<inherited>true</inherited>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -12,12 +12,13 @@
package com.ut.tekir.permission;
import com.ut.tekir.entities.RolePermission;
import com.ut.tekir.entities.User;
import com.ut.tekir.entities.UserRole;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
......@@ -30,10 +31,6 @@ import org.jboss.seam.log.Log;
import org.jboss.seam.log.Logging;
import org.jboss.seam.security.Identity;
import com.ut.tekir.entities.RolePermission;
import com.ut.tekir.entities.User;
import com.ut.tekir.entities.UserRole;
/**
*
* @author Hakan Uygun
......@@ -63,7 +60,7 @@ public class TekirIdentity extends Identity{
activeUser = (User)Component.getInstance("activeUser");
//currentAccessLevel = (Integer)Component.getInstance("currentAccessLevel");
log.info("permission check #0, #1, #2", name, action, activeUser );
log.debug("permission check #0, #1, #2", name, action, activeUser );
//Önce build-in roller kontrol edilecek.
//TODO: Build-in roller net bir şekilde tanımlanmalı...
......@@ -93,7 +90,7 @@ public class TekirIdentity extends Identity{
@Observer("refreshPermissionMap")
public void refreshPermissionMap() {
log.info("Refreshing permission map");
log.debug("Refreshing permission map");
permissionMap.clear();
for (UserRole role : activeUser.getRoles()) {
populatePermissionMap(role.getRole().getName());
......
......@@ -22,7 +22,7 @@
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5InnoDBDialect"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.hbm2ddl.auto" value="none"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>
<property name="jboss.entity.manager.factory.jndi.name" value="java:/tekirEntityManagerFactory"/>
......
......@@ -28,7 +28,7 @@
<url>${liquibase.url}</url>
<username>${liquibase.user}</username>
<password>${liquibase.pass}</password>
<contexts>devel</contexts>
<contexts>create-db</contexts>
</configuration>
<executions>
<execution>
......
......@@ -63,8 +63,8 @@
<changeSet author="huygun" id="data-9" context="create-db">
<loadData tableName="CURRENCY_PAIR" file="datas/currencyPairs.csv">
<column name="ID" type="NUMERIC" />
<column name="hard_Currency_id" type="NUMERIC" />
<column name="weak_Currency_id" type="NUMERIC" />
<column name="HARD_CURRENCY_ID" type="NUMERIC" />
<column name="WEAK_CURRENCY_ID" type="NUMERIC" />
<column name="ISACTIVE" type="BOOLEAN" />
</loadData>
</changeSet>
......
ID,hard_Currency_id,weak_Currency_id,ISACTIVE
ID,HARD_CURRENCY_ID,WEAK_CURRENCY_ID,ISACTIVE
1,2,1,TRUE
2,3,1,TRUE
3,4,1,TRUE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment