Skip to content

Commit

Permalink
Merge branch 'master' into pethers/update-admin-constants
Browse files Browse the repository at this point in the history
  • Loading branch information
pethers authored Jan 16, 2025
2 parents 537a4c1 + 21ac3a5 commit 957ab20
Show file tree
Hide file tree
Showing 73 changed files with 2,754 additions and 2,204 deletions.
10 changes: 5 additions & 5 deletions citizen-intelligence-agency/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<exec executable="${maven.binary}" dir="../parent-pom/">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="-B --file pom.xml clean install -Prelease-site,all-modules -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT" />
line="-B --file pom.xml clean install -pl !cia-dist-deb -Prelease-site,all-modules -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT" />
</exec>
</target>

Expand All @@ -48,7 +48,7 @@
<exec executable="${maven.binary}" dir="../parent-pom/">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="clean install -T 1.5C -Pall-modules -Dhttps.protocols=TLSv1.2 -Dmaven.test.failure.ignore=true" />
line="clean install -T 1.5C -pl !cia-dist-deb -Pall-modules -Dhttps.protocols=TLSv1.2 -Dmaven.test.failure.ignore=true" />
</exec>
</target>
<target name="clean-install-service" description="cia-clean-install-service" depends="init">
Expand All @@ -64,10 +64,10 @@
</exec>
</target>
<target name="clean-install-notest" description="cia-clean-install-notest" depends="init">
<exec executable="${maven.binary}" dir="../parent-pom/">
<exec executable="${maven.binary}" dir="../">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="clean install -Dtest=no -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Pall-modules -Dhttps.protocols=TLSv1.2" />
line="clean install -Pall-modules -Dtest=no -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -pl '!cia-dist-deb,!cia-dist-cloudformation'" />
</exec>
</target>

Expand Down Expand Up @@ -125,7 +125,7 @@
<exec executable="${maven.binary}" dir=".">
<env key="MAVEN_OPTS" value="-server -Xmx6048m -Xms6048m " />
<arg
line="clean install site -Prelease-site -Dmaven.test.failure.ignore=true -DforkMode=once -Dannotation.failOnError=false" />
line="clean install site -Prelease-site -Dtest=no -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -DforkMode=once -Dannotation.failOnError=false" />
</exec>
</target>
<target name="site-cia-all" description="cia-site-cia-all" depends="init">
Expand Down
42 changes: 0 additions & 42 deletions citizen-intelligence-agency/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${cia.project.versions.hibernate}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -1422,7 +1421,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.10.0</version>
</dependency>
</dependencies>
<repositories>
Expand Down Expand Up @@ -1511,7 +1509,6 @@
<alias>jetty</alias>
<dname>cn=localhost, ou=None, L=None, ST=None, o=None, c=SE</dname>
<sigalg>SHA256withRSA</sigalg>
<ext></ext>
<validity>365</validity>
<keyalg>RSA</keyalg>
<keysize>4096</keysize>
Expand Down Expand Up @@ -1686,45 +1683,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<systemProperties>
<systemProperty>
<name>logback.configurationFile</name>
<value>src/main/resources/logback.xml</value>
</systemProperty>
<systemProperty>
<name>slf4j</name>
<value>true</value>
</systemProperty>
</systemProperties>
<stopPort>9966</stopPort>
<stopKey>stop</stopKey>
<scanIntervalSeconds>0</scanIntervalSeconds>
<webAppConfig>
<contextPath>/cia</contextPath>
</webAppConfig>
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${cia.project.versions.jetty}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>${cia.project.versions.asm}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${cia.project.versions.asm}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<reporting>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;

/**
* The Interface MenuItemAdminConstants.
*/
public interface MenuItemAdminConstants {

/** The admin text. */
String ADMIN_TEXT = "Admin";

/** The agency. */
String AGENCY = "Agency";

/** The agent operations text. */
String AGENT_OPERATIONS_TEXT = "Agent operations";

/** The application. */
String APPLICATION = "Application";

/** The application configuration. */
String APPLICATION_CONFIGURATION = "System settings";

/** The application event. */
String APPLICATION_EVENT = "Application Event";

/** The application event charts. */
String APPLICATION_EVENT_CHARTS = "Application Event charts";

/** The application session. */
String APPLICATION_SESSION = "Application Session";

/** The application session charts. */
String APPLICATION_SESSION_CHARTS = "Active Daily Users";

/** The system performance. */
String SYSTEM_PERFORMANCE = "System Performance";

/** The management. */
String MANAGEMENT = "Management";

/** The configuration. */
String CONFIGURATION = "Configuration";

/** The portal. */
String PORTAL = "Portal";

/** The email. */
String EMAIL = "Email";

/** The language. */
String LANGUAGE = "Language";


/** The Constant DATA_AUTHOR_SUMMARY. */
String DATA_AUTHOR_SUMMARY = "Data author summary";

/** The Constant DATA_SUMMARY_TEXT. */
String DATA_SUMMARY_TEXT = "Data Summary";



}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api;

/**
* Constants for committee-related menu items.
*/
public interface MenuItemCommitteeConstants {

/** The committee ranking text. */
// Base committee labels
String COMMITTEE_RANKING_TEXT = "Committee Ranking";

/** The committee roles. */
String COMMITTEE_ROLES = "Committee Roles";

/** The committees link text. */
String COMMITTEES_LINK_TEXT = "Committees";

/** The committee ranking description. */
// Committee descriptions
String COMMITTEE_RANKING_DESCRIPTION = "Committees: shaping policy debates.";

/** The committees description. */
String COMMITTEES_DESCRIPTION = "All committees: roles and responsibilities.";

/** The committee roles description. */
String COMMITTEE_ROLES_DESCRIPTION = "Committee roles description";

/** The page visit history description. */
String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page.";

/** The documents text. */
// Document and ballot related
String DOCUMENTS_TEXT = "Documents";

/** The ballots text. */
String BALLOTS_TEXT = "Ballots";

/** The ballot decision summary text. */
String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary";

/** The current committees text. */
// Other committee constants
String CURRENT_COMMITTEES_TEXT = "Current Committees";

/** The committee history text. */
String COMMITTEE_HISTORY_TEXT = "Committee History";

/** The committee details text. */
String COMMITTEE_DETAILS_TEXT = "Committee Details";
}
Loading

0 comments on commit 957ab20

Please sign in to comment.