Hi Lalaji, Why did we decide to do this in this way? This makes the API Asset look horrible once opened in the Resource Browser, can't we use the resource permissions instead?
Thanks, Senaka. On Fri, Dec 7, 2012 at 3:18 PM, <[email protected]> wrote: > Author: lalaji > Date: Fri Dec 7 15:18:16 2012 > New Revision: 150612 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=150612 > > Log: > Applying fix for APIMANAGER-871 ,to segment APIStore based on subscriber's > role,and added the patch given for APIMANAGER-13 > > Modified: > > > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java > > > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java > > > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIMgtDBUtil.java > > > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java > > Modified: > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java?rev=150612&r1=150611&r2=150612&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java > (original) > +++ > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java > Fri Dec 7 15:18:16 2012 > @@ -82,6 +82,8 @@ > public static final String API_OVERVIEW_TEC_OWNER_EMAIL > ="overview_technicalOwnerEmail"; > public static final String API_OVERVIEW_BUSS_OWNER > ="overview_businessOwner"; > public static final String API_OVERVIEW_BUSS_OWNER_EMAIL > ="overview_businessOwnerEmail"; > + public static final String API_OVERVIEW_VISIBILITY > ="overview_visibility"; > + public static final String API_OVERVIEW_VISIBLE_ROLES > ="overview_visibleRoles"; > public static final String API_STATUS = "STATUS"; > public static final String API_URI_PATTERN ="URITemplate_urlPattern"; > public static final String API_URI_HTTP_METHOD > ="URITemplate_httpVerb"; > > Modified: > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java?rev=150612&r1=150611&r2=150612&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java > (original) > +++ > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/internal/APIManagerComponent.java > Fri Dec 7 15:18:16 2012 > @@ -75,7 +75,7 @@ > > private ServiceRegistration registration; > > - protected void activate(ComponentContext componentContext) { > + protected void activate(ComponentContext componentContext) throws > Exception { > if (log.isDebugEnabled()) { > log.debug("API manager component activated"); > } > > Modified: > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIMgtDBUtil.java > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIMgtDBUtil.java?rev=150612&r1=150611&r2=150612&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIMgtDBUtil.java > (original) > +++ > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIMgtDBUtil.java > Fri Dec 7 15:18:16 2012 > @@ -40,6 +40,7 @@ > private static final Log log = LogFactory.getLog(APIMgtDBUtil.class); > > private static volatile DataSource dataSource = null; > + private static final String DB_CHECK_SQL = "SELECT * FROM > AM_SUBSCRIBER"; > > private static final String DB_CONFIG = "Database."; > private static final String DB_DRIVER = DB_CONFIG + "Driver"; > @@ -54,7 +55,7 @@ > * > * @throws APIManagementException if an error occurs while loading DB > configuration > */ > - public static void initialize() throws APIManagementException { > + public static void initialize() throws Exception { > if (dataSource != null) { > return; > } > @@ -95,6 +96,30 @@ > dataSource = basicDataSource; > } > } > + setupAPIManagerDatabase(); > + } > + } > + > + /** > + * Creates the APIManager Database if not created already. > + * > + * @throws Exception if an error occurs while creating the > APIManagerDatabase. > + */ > + private static void setupAPIManagerDatabase() throws Exception { > + > + String value = System.getProperty("setup"); > + if (value != null) { > + LocalDatabaseCreator databaseCreator = new > LocalDatabaseCreator(dataSource); > + try { > + if > (!databaseCreator.isDatabaseStructureCreated(DB_CHECK_SQL)) { > + databaseCreator.createRegistryDatabase(); > + } else { > + log.info("APIManager database already exists. Not > creating a new database."); > + } > + } catch (Exception e) { > + String msg = "Error in creating the APIManager database"; > + throw new Exception(msg, e); > + } > } > } > > > Modified: > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java?rev=150612&r1=150611&r2=150612&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java > (original) > +++ > carbon/platform/branches/4.0.0/components/apimgt/org.wso2.carbon.apimgt.impl/1.0.5/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java > Fri Dec 7 15:18:16 2012 > @@ -96,6 +96,8 @@ > > > api.setTechnicalOwnerEmail(artifact.getAttribute(APIConstants.API_OVERVIEW_TEC_OWNER_EMAIL)); > > > api.setBusinessOwner(artifact.getAttribute(APIConstants.API_OVERVIEW_BUSS_OWNER)); > > > api.setBusinessOwnerEmail(artifact.getAttribute(APIConstants.API_OVERVIEW_BUSS_OWNER_EMAIL)); > + > > api.setVisibility(artifact.getAttribute(APIConstants.API_OVERVIEW_VISIBILITY)); > + > > api.setVisibleRoles(artifact.getAttribute(APIConstants.API_OVERVIEW_VISIBLE_ROLES)); > > Set<Tier> availableTier = new HashSet<Tier>(); > String tiers = > artifact.getAttribute(APIConstants.API_OVERVIEW_TIER); > @@ -190,6 +192,8 @@ > > > api.setThumbnailUrl(artifact.getAttribute(APIConstants.API_OVERVIEW_THUMBNAIL_URL)); > > > api.setStatus(getApiStatus(artifact.getAttribute(APIConstants.API_OVERVIEW_STATUS))); > > api.setContext(artifact.getAttribute(APIConstants.API_OVERVIEW_CONTEXT)); > + > > api.setVisibility(artifact.getAttribute(APIConstants.API_OVERVIEW_VISIBILITY)); > + > > api.setVisibleRoles(artifact.getAttribute(APIConstants.API_OVERVIEW_VISIBLE_ROLES)); > } catch (GovernanceException e) { > String msg = "Failed to get API from artifact "; > throw new APIManagementException(msg, e); > @@ -248,6 +252,9 @@ > > artifact.setAttribute(APIConstants.API_OVERVIEW_TEC_OWNER_EMAIL, > api.getTechnicalOwnerEmail()); > artifact.setAttribute(APIConstants.API_OVERVIEW_BUSS_OWNER, > api.getBusinessOwner()); > > artifact.setAttribute(APIConstants.API_OVERVIEW_BUSS_OWNER_EMAIL, > api.getBusinessOwnerEmail()); > + artifact.setAttribute(APIConstants.API_OVERVIEW_VISIBILITY, > api.getVisibility()); > + > artifact.setAttribute(APIConstants.API_OVERVIEW_VISIBLE_ROLES, > api.getVisibleRoles()); > + > String tiers = ""; > for (Tier tier : api.getAvailableTiers()) { > tiers += tier.getName() + "||"; > _______________________________________________ > Commits mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/commits > -- * <http://wso2con.com/> * * Senaka Fernando* Member - Integration Technologies Management Committee; Technical Lead; WSO2 Inc.; http://wso2.com* Member; Apache Software Foundation; http://apache.org E-mail: senaka AT wso2.com **P: +1 408 754 7388; ext: 51736*; *M: +94 77 322 1818 Linked-In: http://linkedin.com/in/senakafernando *Lean . Enterprise . Middleware
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
