Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.osee.orcs.feature/feature.xml7
-rw-r--r--plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/.classpath7
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/.project33
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/META-INF/MANIFEST.MF17
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/OSGI-INF/osee.authorization.provider.xml (renamed from plugins/org.eclipse.osee.authorization.admin/OSGI-INF/osee.authorization.provider.xml)2
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/build.properties5
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/pom.xml34
-rw-r--r--plugins/org.eclipse.osee.orcs.authorization/src/org/eclipse/osee/orcs/authorization/OseeAuthorizationProvider.java (renamed from plugins/org.eclipse.osee.authorization.admin/src/org/eclipse/osee/authorization/admin/internal/OseeAuthorizationProvider.java)5
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml4
11 files changed, 113 insertions, 14 deletions
diff --git a/features/org.eclipse.osee.orcs.feature/feature.xml b/features/org.eclipse.osee.orcs.feature/feature.xml
index 08a0892a5a..1c943a9d5c 100644
--- a/features/org.eclipse.osee.orcs.feature/feature.xml
+++ b/features/org.eclipse.osee.orcs.feature/feature.xml
@@ -115,4 +115,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.osee.orcs.authorization"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF
index ef67803cc8..9a617dba98 100644
--- a/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.authorization.admin.test/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 0.22.0.qualifier
Fragment-Host: org.eclipse.osee.authorization.admin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
-Import-Package: org.hamcrest.core,
+Import-Package: org.eclipse.osee.framework.jdk.core.type,
+ org.hamcrest.core,
org.junit,
org.junit.rules,
org.junit.runner,
diff --git a/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF
index 71c1924d8e..bc7177a9c1 100644
--- a/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.authorization.admin/META-INF/MANIFEST.MF
@@ -7,12 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/*.xml
Export-Package: org.eclipse.osee.authorization.admin
-Import-Package: org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.enums,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.logger,
- org.eclipse.osee.orcs,
- org.eclipse.osee.orcs.data,
- org.eclipse.osee.orcs.search
+Import-Package: org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.logger
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.orcs.authorization/.classpath b/plugins/org.eclipse.osee.orcs.authorization/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.authorization/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.osee.orcs.authorization/.project b/plugins/org.eclipse.osee.orcs.authorization/.project
new file mode 100644
index 0000000000..c8b8845b8c
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.authorization/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.osee.orcs.authorization</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.orcs.authorization/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.authorization/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..f26922e16c
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.authorization/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ORCS Authorization (Incubation)
+Bundle-SymbolicName: org.eclipse.osee.orcs.authorization
+Bundle-Version: 0.22.0.qualifier
+Bundle-Vendor: Eclipse Open System Engineering Environment
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/*.xml
+Export-Package: org.eclipse.osee.orcs.authorization
+Import-Package: org.eclipse.osee.authorization.admin,
+ org.eclipse.osee.framework.core.data,
+ org.eclipse.osee.framework.core.enums,
+ org.eclipse.osee.framework.jdk.core.type,
+ org.eclipse.osee.orcs,
+ org.eclipse.osee.orcs.data,
+ org.eclipse.osee.orcs.search
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.authorization.admin/OSGI-INF/osee.authorization.provider.xml b/plugins/org.eclipse.osee.orcs.authorization/OSGI-INF/osee.authorization.provider.xml
index 2b63a45678..6212286824 100644
--- a/plugins/org.eclipse.osee.authorization.admin/OSGI-INF/osee.authorization.provider.xml
+++ b/plugins/org.eclipse.osee.orcs.authorization/OSGI-INF/osee.authorization.provider.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.eclipse.osee.authorization.admin.internal.OseeAuthorizationProvider"/>
+ <implementation class="org.eclipse.osee.orcs.authorization.OseeAuthorizationProvider"/>
<service>
<provide interface="org.eclipse.osee.authorization.admin.AuthorizationProvider"/>
</service>
diff --git a/plugins/org.eclipse.osee.orcs.authorization/build.properties b/plugins/org.eclipse.osee.orcs.authorization/build.properties
new file mode 100644
index 0000000000..c58ea2178c
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.authorization/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ OSGI-INF/
diff --git a/plugins/org.eclipse.osee.orcs.authorization/pom.xml b/plugins/org.eclipse.osee.orcs.authorization/pom.xml
new file mode 100644
index 0000000000..f97259e41b
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.authorization/pom.xml
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.orcs.parent</artifactId>
+ <version>0.22.0-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.orcs.authorization</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>ORCS Authorization - (Incubation)</name>
+
+ <build>
+ <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.authorization.admin/src/org/eclipse/osee/authorization/admin/internal/OseeAuthorizationProvider.java b/plugins/org.eclipse.osee.orcs.authorization/src/org/eclipse/osee/orcs/authorization/OseeAuthorizationProvider.java
index 17b3d1cd3c..7674df4ee0 100644
--- a/plugins/org.eclipse.osee.authorization.admin/src/org/eclipse/osee/authorization/admin/internal/OseeAuthorizationProvider.java
+++ b/plugins/org.eclipse.osee.orcs.authorization/src/org/eclipse/osee/orcs/authorization/OseeAuthorizationProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.authorization.admin.internal;
+package org.eclipse.osee.orcs.authorization;
import java.security.Principal;
import java.util.Date;
@@ -74,8 +74,7 @@ public class OseeAuthorizationProvider implements AuthorizationProvider, Authori
Set<String> roles = new HashSet<String>();
ArtifactReadable oseeUser =
getQuery().fromBranch(getAdminBranch()).andUuid(identifier).getResults().getExactlyOne();
- ResultSet<ArtifactReadable> groups = oseeUser.getRelated(CoreRelationTypes.User_Grouping__Group);
-
+ ResultSet<ArtifactReadable> groups = oseeUser.getRelated(CoreRelationTypes.Universal_Grouping__Group);
for (ArtifactReadable group : groups) {
roles.add(group.getName());
}
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index f99f6f57f0..a99d45b5f0 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -43,7 +43,9 @@
<module>../../plugins/org.eclipse.osee.orcs.rest.test</module>
<module>../../plugins/org.eclipse.osee.orcs.db.test</module>
<module>../../plugins/org.eclipse.osee.orcs.test</module>
-
+
+ <module>../../plugins/org.eclipse.osee.orcs.authorization</module>
+
<module>../../plugins/org.eclipse.osee.orcs.account.admin</module>
<module>../../plugins/org.eclipse.osee.orcs.account.admin.test</module>

Back to the top